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 1af7a3bad0e979bf07ae1fc0442317e9667ba7d3..ef2247f12b84338e609fa594f44e605853fac933 100644 (file)
--- a/libs/ardour/ardour/bundle.h
+++ b/libs/ardour/ardour/bundle.h
@@ -22,22 +22,25 @@
 
 #include <string>
 #include <vector>
-#include <glibmm/thread.h>
-#include <sigc++/signal.h>
+#include <glibmm/threads.h>
 #include <boost/shared_ptr.hpp>
+
+#include "pbd/signals.h"
+
 #include "ardour/data_type.h"
+#include "ardour/chan_count.h"
 
 namespace ARDOUR {
 
 class AudioEngine;
 
 /** A set of `channels', each of which is associated with 0 or more ports.
- *  Each channel has a name which can be anything useful.
+ *  Each channel has a name which can be anything useful, and a data type.
  *  Intended for grouping things like, for example, a buss' outputs.
  *  `Channel' is a rather overloaded term but I can't think of a better
  *  one right now.
  */
-class Bundle : public sigc::trackable
+class LIBARDOUR_API Bundle : public PBD::ScopedConnectionList
 {
   public:
 
@@ -47,33 +50,40 @@ class Bundle : public sigc::trackable
        typedef std::vector<std::string> PortList;
 
        struct Channel {
-               Channel (std::string n) : name (n) {}
+               Channel (std::string n, DataType t) : name (n), type (t) {}
+               Channel (std::string n, DataType t, PortList p) : name (n), type (t), ports (p) {}
+               Channel (std::string n, DataType t, std::string const & p) : name (n), type (t) {
+                       ports.push_back (p);
+               }
 
                bool operator== (Channel const &o) const {
-                       return name == o.name && ports == o.ports;
+                       return name == o.name && type == o.type && ports == o.ports;
                }
 
                std::string name;
+               DataType type;
                PortList ports;
        };
 
        Bundle (bool i = true);
        Bundle (std::string const &, bool i = true);
-       Bundle (std::string const &, DataType, bool i = true);
        Bundle (boost::shared_ptr<Bundle>);
 
        virtual ~Bundle() {}
 
        /** @return Number of channels that this Bundle has */
-       uint32_t nchannels () const;
+       ChanCount nchannels () const;
 
        /** @param Channel index.
         *  @return Ports associated with this channel.
         */
        PortList const & channel_ports (uint32_t) const;
 
-       void add_channel (std::string const &);
+       void add_channel (std::string const &, DataType);
+       void add_channel (std::string const &, DataType, std::string const &);
+       void add_channel (std::string const &, DataType, PortList);
        std::string channel_name (uint32_t) const;
+       DataType channel_type (uint32_t) const;
        void set_channel_name (uint32_t, std::string const &);
        void add_port_to_channel (uint32_t, std::string);
        void set_port (uint32_t, std::string);
@@ -81,7 +91,7 @@ class Bundle : public sigc::trackable
        void remove_ports_from_channel (uint32_t);
        void remove_ports_from_channels ();
        bool port_attached_to_channel (uint32_t, std::string);
-       bool uses_port (std::string) const;
+       bool offers_port (std::string) const;
        bool offers_port_alone (std::string) const;
        void remove_channel (uint32_t);
        void remove_channels ();
@@ -89,18 +99,16 @@ class Bundle : public sigc::trackable
        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;
 
        void set_name (std::string const &);
 
        /** @return Bundle name */
        std::string name () const { return _name; }
 
-       void set_type (DataType);
-
-       /** @return Type of the ports in this Bundle. */
-       DataType type () const { return _type; }
-
        void set_ports_are_inputs ();
        void set_ports_are_outputs ();
        bool ports_are_inputs () const { return _ports_are_inputs; }
@@ -109,6 +117,8 @@ class Bundle : public sigc::trackable
        void suspend_signals ();
        void resume_signals ();
 
+       bool operator== (Bundle const & other);
+
        /** Things that might change about this bundle */
        enum Change {
                NameChanged = 0x1, ///< the bundle name or a channel name has changed
@@ -118,13 +128,13 @@ class Bundle : public sigc::trackable
                DirectionChanged = 0x10 ///< the direction (whether ports are inputs or outputs) has changed
        };
 
-       sigc::signal<void, Change> Changed;
+       PBD::Signal1<void,Change> Changed;
 
   protected:
 
        /// 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:
@@ -133,20 +143,18 @@ class Bundle : public sigc::trackable
        void emit_changed (Change);
 
        std::string _name;
-       DataType _type;
        bool _ports_are_inputs;
 
        bool _signals_suspended;
        Change _pending_change;
 };
 
-
-
-struct BundleChannel
+class LIBARDOUR_API BundleChannel
 {
-       BundleChannel () : channel (0) {}
+public:
+       BundleChannel () : channel (-1) {}
 
-       BundleChannel (boost::shared_ptr<Bundle> b, uint32_t c)
+       BundleChannel (boost::shared_ptr<Bundle> b, int c)
                : bundle (b), channel (c) {}
 
        bool operator== (BundleChannel const& other) const {
@@ -158,9 +166,11 @@ struct BundleChannel
        }
 
        boost::shared_ptr<Bundle> bundle;
-       uint32_t channel;
+       int channel; ///< channel index, or -1 for "all"
 };
 
 }
 
+std::ostream & operator<< (std::ostream & o, ARDOUR::Bundle const &);
+
 #endif /* __ardour_bundle_h__ */