diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-03-16 04:01:30 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-03-16 04:01:30 +1100 |
| commit | 135e865302b5cd20a6cb0a0a4aaa682f839ffe67 (patch) | |
| tree | 608cbb71aec4de5f6d2acc11f3fbec1a036de6c5 /libs | |
| parent | a5db1d588e6bc61c26bd7d24530feeeb0283e95f (diff) | |
Add route dialog order hint changes.
Add an option to insert new routes at the top of the list ("First").
Reorder/rename the entries in the dialog.
Session's _order_hint is now the signed int it always wanted to be.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index b50d502e16..ad5f236a84 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -243,7 +243,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b); }; - void set_order_hint (uint32_t order_hint) {_order_hint = order_hint;}; + void set_order_hint (int32_t order_hint) {_order_hint = order_hint;}; void notify_remote_id_change (); void sync_order_keys (); @@ -1677,7 +1677,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop GraphEdges _current_route_graph; uint32_t next_control_id () const; - uint32_t _order_hint; + int32_t _order_hint; bool ignore_route_processor_changes; MidiClockTicker* midi_clock; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b30be6800a..9e3e168242 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -266,7 +266,7 @@ Session::Session (AudioEngine &eng, , _step_editors (0) , _suspend_timecode_transmission (0) , _speakers (new Speakers) - , _order_hint (0) + , _order_hint (-1) , ignore_route_processor_changes (false) , _scene_changer (0) , _midi_ports (0) @@ -2554,9 +2554,9 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool ChanCount existing_outputs; uint32_t order = next_control_id(); - if (_order_hint != 0) { + if (_order_hint > -1) { order = _order_hint; - _order_hint = 0; + _order_hint = -1; } count_existing_track_channels (existing_inputs, existing_outputs); |