Mix group tabs in the mixer.

git-svn-id: svn://localhost/ardour2/branches/3.0@5228 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-06-20 17:15:33 +00:00
parent 9dfa933c6e
commit be3aff4bda
15 changed files with 277 additions and 28 deletions

View file

@ -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 */

View file

@ -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)

View file

@ -2004,7 +2004,6 @@ Route::drop_edit_group (void *src)
void
Route::set_mix_group (RouteGroup *mg, void *src)
{
if (mg == _mix_group) {
return;

View file

@ -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 */
}