fix and improve MTC-slave

[ardour.git] / libs / pbd / file_manager.cc

diff --git a/libs/pbd/file_manager.cc b/libs/pbd/file_manager.cc
index 45f678ee5d46a87e298142127a695b69e0441ae3..a71ffca190259be5c24c66706d95bd6da7694e19 100644 (file)
--- a/libs/pbd/file_manager.cc
+++ b/libs/pbd/file_manager.cc
@@ -23,7 +23,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <cassert>
-#include <iostream>
 #include <cstdio>
 
 #ifdef __APPLE__
@@ -58,7 +57,7 @@ FileManager::FileManager ()
 void
 FileManager::add (FileDescriptor* d)
 {
-       Glib::Mutex::Lock lm (_mutex);
+       Glib::Threads::Mutex::Lock lm (_mutex);
        _files.push_back (d);
 }
 
@@ -66,7 +65,7 @@ FileManager::add (FileDescriptor* d)
 bool
 FileManager::allocate (FileDescriptor* d)
 {
-       Glib::Mutex::Lock lm (_mutex);
+       Glib::Threads::Mutex::Lock lm (_mutex);
 
        if (!d->is_open()) {
                
@@ -116,7 +115,7 @@ FileManager::allocate (FileDescriptor* d)
        }
 
 #ifdef __APPLE__
-       d->_last_used = get_absolute_time();
+       d->_last_used = mach_absolute_time();
 #else
        struct timespec t;
        clock_gettime (CLOCK_MONOTONIC, &t);
@@ -132,7 +131,7 @@ FileManager::allocate (FileDescriptor* d)
 void
 FileManager::release (FileDescriptor* d)
 {
-       Glib::Mutex::Lock lm (_mutex);
+       Glib::Threads::Mutex::Lock lm (_mutex);
 
        d->_refcount--;
        assert (d->_refcount >= 0);
@@ -142,7 +141,7 @@ FileManager::release (FileDescriptor* d)
 void
 FileManager::remove (FileDescriptor* d)
 {
-       Glib::Mutex::Lock lm (_mutex);
+       Glib::Threads::Mutex::Lock lm (_mutex);
 
        if (d->is_open ()) {
                close (d);
@@ -193,15 +192,15 @@ FileDescriptor::release ()
 
 
 
-/** @param n Filename.
- *  @param w true to open writeable, otherwise false.
- *  @param m Open mode for the file.
+/** @param file_name Filename.
+ *  @param writeable true to open writeable, otherwise false.
+ *  @param mode Open mode for the file.
  */
 
-FdFileDescriptor::FdFileDescriptor (string const & n, bool w, mode_t m)
-       : FileDescriptor (n, w)
+FdFileDescriptor::FdFileDescriptor (string const & file_name, bool writeable, mode_t mode)
+       : FileDescriptor (file_name, writeable)
        , _fd (-1)
-       , _mode (m)
+       , _mode (mode)
 {
        manager()->add (this);
 }
@@ -259,14 +258,14 @@ FileDescriptor::set_path (const string& p)
         _path = p;
 }
 
-/** @param n Filename.
- *  @param w true to open writeable, otherwise false.
+/** @param file_name Filename.
+ *  @param mode Mode to pass to fopen.
  */
 
-StdioFileDescriptor::StdioFileDescriptor (string const & n, std::string const & m)
-       : FileDescriptor (n, false)
+StdioFileDescriptor::StdioFileDescriptor (string const & file_name, std::string const & mode)
+       : FileDescriptor (file_name, false)
        , _file (0)
-       , _mode (m)
+       , _mode (mode)
 {
        manager()->add (this);
 }