major fixes for MIDI patch change and note undo/redo. Patch change handling was compl...

[ardour.git] / libs / ardour / ardour / bundle.h

diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h
index 2bf614e75f86015cd3bf76864da2b559e893dc38..02845481b61a4c67a5282cfffbfa8290281368e7 100644 (file)
--- a/libs/ardour/ardour/bundle.h
+++ b/libs/ardour/ardour/bundle.h
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <vector>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
@@ -134,7 +134,7 @@ class Bundle : public PBD::ScopedConnectionList
 
        /// mutex for _channel_ports and _channel_names
        /// XXX: is this necessary?
-       mutable Glib::Mutex _channel_mutex;
+       mutable Glib::Threads::Mutex _channel_mutex;
        std::vector<Channel> _channel;
 
   private:
@@ -149,8 +149,9 @@ class Bundle : public PBD::ScopedConnectionList
        Change _pending_change;
 };
 
-struct BundleChannel
+class BundleChannel
 {
+public:
        BundleChannel () : channel (-1) {}
 
        BundleChannel (boost::shared_ptr<Bundle> b, int c)