diff options
author | Carl Hetherington <carl@carlh.net> | 2009-06-21 19:59:56 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-06-21 19:59:56 +0000 |
commit | 955d731fa6933e6769986687a781d16f7889da67 (patch) | |
tree | 84a383627ac0a9548f5b789b17740915846e5dcf /gtk2_ardour/mixer_strip.h | |
parent | 8cd536ab85b5923fe97d32cb93c913420fbaf5bf (diff) |
Merge edit and mix groups to just being route groups. Add properties to route groups to decide what things their member routes will share. Allow edits to happen across a route group without its tracks necessarily being selected.
git-svn-id: svn://localhost/ardour2/branches/3.0@5236 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.h')
-rw-r--r-- | gtk2_ardour/mixer_strip.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index ced789f3ef..ca9f1f844f 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -94,7 +94,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void fast_update (); void set_embedded (bool); - ARDOUR::RouteGroup* mix_group() const; + ARDOUR::RouteGroup* route_group() const; void set_route (boost::shared_ptr<ARDOUR::Route>); #ifdef GTKOSX @@ -226,10 +226,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void comment_edited (); bool ignore_comment_edit; - void set_mix_group (ARDOUR::RouteGroup *); - void add_mix_group_to_menu (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*); - bool select_mix_group (GdkEventButton *); - void mix_group_changed (void *); + void set_route_group (ARDOUR::RouteGroup *); + void add_route_group_to_menu (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*); + bool select_route_group (GdkEventButton *); + void route_group_changed (void *); IOSelectorWindow *input_selector; IOSelectorWindow *output_selector; @@ -257,7 +257,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox boost::shared_ptr<ARDOUR::Delivery> _current_delivery; void revert_to_default_display (); - void set_mix_group_to_new (); + void set_route_group_to_new (); static int scrollbar_height; }; |