#include <string>
#include <set>
#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
+#include "pbd/signals.h"
#include <gtkmm/widget.h>
#include <gtkmm/checkbutton.h>
}
class PortMatrix;
-class RouteBundle;
class PublicEditor;
/** A list of bundles grouped by some aspect of their type e.g. busses, tracks, system.
void remove_bundle (boost::shared_ptr<ARDOUR::Bundle>);
boost::shared_ptr<ARDOUR::Bundle> only_bundle ();
void clear ();
- uint32_t total_channels () const;
+ ARDOUR::ChanCount total_channels () const;
boost::shared_ptr<ARDOUR::IO> io_from_bundle (boost::shared_ptr<ARDOUR::Bundle>) const;
+ void remove_duplicates ();
std::string name; ///< name for the group
bool has_port (std::string const &) const;
/** The bundle list has changed in some way; a bundle has been added or removed, or the list cleared etc. */
- sigc::signal<void> Changed;
+ PBD::Signal0<void> Changed;
/** An individual bundle on our list has changed in some way */
- boost::signals2::signal<void(ARDOUR::Bundle::Change)> BundleChanged;
+ PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
struct BundleRecord {
boost::shared_ptr<ARDOUR::Bundle> bundle;
/** IO whose ports are in the bundle, or 0. This is so that we can do things like adding
ports to the IO from matrix editor menus. */
- boost::shared_ptr<ARDOUR::IO> io;
+ boost::weak_ptr<ARDOUR::IO> io;
Gdk::Color colour;
bool has_colour;
- boost::signals2::scoped_connection changed_connection;
+ PBD::ScopedConnection changed_connection;
BundleRecord (boost::shared_ptr<ARDOUR::Bundle>, boost::shared_ptr<ARDOUR::IO>, Gdk::Color, bool has_colour);
};
void add_group (boost::shared_ptr<PortGroup>);
void add_group_if_not_empty (boost::shared_ptr<PortGroup>);
- void set_type (ARDOUR::DataType);
- void gather (ARDOUR::Session *, bool, bool);
+ void gather (ARDOUR::Session *, ARDOUR::DataType, bool, bool);
PortGroup::BundleList const & bundles () const;
void clear ();
void remove_bundle (boost::shared_ptr<ARDOUR::Bundle>);
- uint32_t total_channels () const;
+ ARDOUR::ChanCount total_channels () const;
uint32_t size () const {
return _groups.size();
}
bool empty () const;
/** The group list has changed in some way; a group has been added or removed, or the list cleared etc. */
- boost::signals2::signal<void()> Changed;
+ PBD::Signal0<void> Changed;
/** A bundle in one of our groups has changed */
- boost::signals2::signal<void(ARDOUR::Bundle::Change)> BundleChanged;
+ PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
private:
bool port_has_prefix (std::string const &, std::string const &) const;
std::string common_prefix_before (std::vector<std::string> const &, std::string const &) const;
void emit_changed ();
void emit_bundle_changed (ARDOUR::Bundle::Change);
- boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, bool) const;
+ boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, ARDOUR::DataType, bool) const;
void maybe_add_processor_to_list (
- boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::Bundle> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
+ boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
);
+ boost::shared_ptr<ARDOUR::Bundle> bundle_for_type (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType) const;
- ARDOUR::DataType _type;
mutable PortGroup::BundleList _bundles;
List _groups;
PBD::ScopedConnectionList _bundle_changed_connections;
+ PBD::ScopedConnectionList _changed_connections;
bool _signals_suspended;
bool _pending_change;
ARDOUR::Bundle::Change _pending_bundle_change;