Merge branch 'master' into cairocanvas

[ardour.git] / libs / pbd / pbd / sndfile_manager.h

diff --git a/libs/pbd/pbd/sndfile_manager.h b/libs/pbd/pbd/sndfile_manager.h
index a73f8cfd44a856b9fde9ef8a795d662a11ba236e..2167cadf5f27e70876ae5335a913e179e7e493a2 100644 (file)
--- a/libs/pbd/pbd/sndfile_manager.h
+++ b/libs/pbd/pbd/sndfile_manager.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <map>
 #include <sndfile.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include "pbd/signals.h"
 #include "pbd/file_manager.h"
 
@@ -34,7 +34,7 @@ namespace PBD {
 class SndFileDescriptor : public FileDescriptor
 {
 public:
-       SndFileDescriptor (std::string const &, bool, SF_INFO *);
+       SndFileDescriptor (std::string const & file_name, bool writeable, SF_INFO* info);
        ~SndFileDescriptor ();
 
        SNDFILE* allocate ();