Exact beat - provide audio->music mapping for region split.

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

diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h
index 46b07c48f5b38ca20aa323d1a326fc5959ad58ff..ef2247f12b84338e609fa594f44e605853fac933 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"
@@ -40,7 +40,7 @@ class AudioEngine;
  *  `Channel' is a rather overloaded term but I can't think of a better
  *  one right now.
  */
-class Bundle : public PBD::ScopedConnectionList
+class LIBARDOUR_API Bundle : public PBD::ScopedConnectionList
 {
   public:
 
@@ -99,6 +99,7 @@ class Bundle : public PBD::ScopedConnectionList
        void connect (boost::shared_ptr<Bundle>, AudioEngine &);
        void disconnect (boost::shared_ptr<Bundle>, AudioEngine &);
        bool connected_to (boost::shared_ptr<Bundle>, AudioEngine &);
+       bool connected_to_anything (AudioEngine &);
        bool has_same_ports (boost::shared_ptr<Bundle>) const;
        uint32_t type_channel_to_overall (DataType, uint32_t) const;
        uint32_t overall_channel_to_type (DataType, uint32_t) const;
@@ -133,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:
@@ -148,8 +149,9 @@ class Bundle : public PBD::ScopedConnectionList
        Change _pending_change;
 };
 
-struct BundleChannel
+class LIBARDOUR_API BundleChannel
 {
+public:
        BundleChannel () : channel (-1) {}
 
        BundleChannel (boost::shared_ptr<Bundle> b, int c)