diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-06-20 17:15:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-06-20 17:15:33 +0000 |
| commit | be3aff4bdabbf5ced06db66d7bea4cd6b7ec3572 (patch) | |
| tree | e076e6648bd3c871481ae89c1e50d2ca54cefd81 /libs | |
| parent | 9dfa933c6e225bc0b244cabd04fec15e95e37f2b (diff) | |
Mix group tabs in the mixer.
git-svn-id: svn://localhost/ardour2/branches/3.0@5228 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_configuration_vars.h | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 7 |
4 files changed, 10 insertions, 2 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index f00ea22a14..668de76b20 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -378,6 +378,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable sigc::signal<void,RouteList&> RouteAdded; sigc::signal<void> RouteEditGroupChanged; + sigc::signal<void> RouteMixGroupChanged; void request_roll_at_and_return (nframes_t start, nframes_t return_to); void request_bounded_roll (nframes_t start, nframes_t end); @@ -1489,6 +1490,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable int load_regions (const XMLNode& node); void route_edit_group_changed (); + void route_mix_group_changed (); /* SOURCES */ diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index b7bdcf6aa7..5330932b26 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -46,4 +46,4 @@ CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true) CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false) CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f) CONFIG_VARIABLE (bool, show_summary, "show-summary", true) -CONFIG_VARIABLE (bool, show_edit_group_tabs, "show-edit-group-tabs", true) +CONFIG_VARIABLE (bool, show_group_tabs, "show-group-tabs", true) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 739a2840ad..19fd9bfe0c 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2004,7 +2004,6 @@ Route::drop_edit_group (void *src) void Route::set_mix_group (RouteGroup *mg, void *src) - { if (mg == _mix_group) { return; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 18145a8048..fb3cb25705 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2083,6 +2083,7 @@ Session::add_routes (RouteList& new_routes, bool save) (*x)->output()->changed.connect (mem_fun (*this, &Session::set_worst_io_latencies_x)); (*x)->processors_changed.connect (bind (mem_fun (*this, &Session::update_latency_compensation), false, false)); (*x)->edit_group_changed.connect (hide (mem_fun (*this, &Session::route_edit_group_changed))); + (*x)->mix_group_changed.connect (hide (mem_fun (*this, &Session::route_mix_group_changed))); if ((*x)->is_master()) { _master_out = (*x); @@ -4254,3 +4255,9 @@ Session::route_edit_group_changed () { RouteEditGroupChanged (); /* EMIT SIGNAL */ } + +void +Session::route_mix_group_changed () +{ + RouteMixGroupChanged (); /* EMIT SIGNAL */ +} |