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 21f005cd4f1b131f2b412737d3319c2bc75ecf58..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()) {
                
@@ -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);
@@ -201,7 +200,7 @@ FileDescriptor::release ()
 FdFileDescriptor::FdFileDescriptor (string const & file_name, bool writeable, mode_t mode)
        : FileDescriptor (file_name, writeable)
        , _fd (-1)
-       , _mode (m)
+       , _mode (mode)
 {
        manager()->add (this);
 }