diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-25 12:46:13 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-25 12:46:13 +0000 |
| commit | 97d920593ffc796986107e16d7bbf88cc3184043 (patch) | |
| tree | cc68f13ec1c9be69f98d30bd734e809fea30a0d1 /gtk2_ardour/mixer_group_tabs.h | |
| parent | f2f35e50a0e2d6e0b2c7f02b5e6c76e82643c80a (diff) | |
drastic rethink of the relationship between remote control ID and route order keys. unless the user explicitly switches to UserOrdered, Route::_remote_control_id is an unallocated pointer, and Route::remote_control_id() simply returns a value based on the relevant order_key() value. Also, change the key used in the Route::order_keys std::map<> from a string to an enum, since there is no evidence that we are benefitting from the theoretical benefit of using a string. Generally tidy up allocation of order keys so that the master and monitor busses always get a "special" MixerSort key value, based on the MMC ID for master (already defined within Ardour), and all other tracks/busses start at zero. Syncing keys between editor and mixer will leave the MixerSort key for the master and monitor bus alone, reflecting the fact that we display these in their own distinct parts of the GUI and they are not orderable like other tracks or busses within the mixer window
git-svn-id: svn://localhost/ardour2/branches/3.0@12923 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_group_tabs.h')
| -rw-r--r-- | gtk2_ardour/mixer_group_tabs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/mixer_group_tabs.h b/gtk2_ardour/mixer_group_tabs.h index d8dd062280..0999dd9808 100644 --- a/gtk2_ardour/mixer_group_tabs.h +++ b/gtk2_ardour/mixer_group_tabs.h @@ -36,7 +36,7 @@ private: } PBD::PropertyList default_properties () const; - std::string order_key () const; + ARDOUR::RouteSortOrderKey order_key () const; ARDOUR::RouteList selected_routes () const; void sync_order_keys (); |