ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix sync of editor and mixer route ordering.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5453 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-08-02 00:33:16 +00:00
parent 512785102c
commit 168b1471dc
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_routes.cc
View File

@ -416,7 +416,7 @@ EditorRoutes::sync_order_keys (string const & src)
TreeModel::Children rows = _model->children();
TreeModel::Children::iterator ri;
if (src != N_ ("editor") || !_session || (_session->state_of_the_state() & Session::Loading) || rows.empty()) {
if (src == N_ ("editor") || !_session || (_session->state_of_the_state() & Session::Loading) || rows.empty()) {
return;
}

23
gtk2_ardour/mixer_ui.cc
View File

@ -374,19 +374,6 @@ Mixer_UI::remove_strip (MixerStrip* strip)
strip_redisplay_does_not_sync_order_keys = false;
}
string
Mixer_UI::get_order_key()
{
return X_("signal");
#if 0
if (Config->get_sync_all_route_ordering()) {
return X_("editor");
} else {
return X_("signal");
}
#endif
}
void
Mixer_UI::sync_order_keys (string const & src)
{
@ -394,7 +381,7 @@ Mixer_UI::sync_order_keys (string const & src)
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator ri;
if (src != get_order_key() || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
if (src == N_("signal") || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
return;
}
@ -408,7 +395,7 @@ Mixer_UI::sync_order_keys (string const & src)
for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
boost::shared_ptr<Route> route = (*ri)[track_columns.route];
int old_key = order;
int new_key = route->order_key (get_order_key());
int new_key = route->order_key (N_("signal"));
neworder[new_key] = old_key;
@ -723,7 +710,7 @@ Mixer_UI::redisplay_track_list ()
strip->route()->set_order_key (N_("signal"), order);
if (!strip_redisplay_does_not_reset_order_keys) {
strip->route()->set_order_key (get_order_key(), order);
strip->route()->set_order_key (N_("signal"), order);
}
if (strip->packed()) {
@ -761,7 +748,7 @@ Mixer_UI::redisplay_track_list ()
}
if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) {
session->sync_order_keys (get_order_key());
session->sync_order_keys (N_("signal"));
}
// Rebind all of the midi controls automatically
@ -884,7 +871,7 @@ Mixer_UI::auto_rebind_midi_controls ()
struct SignalOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
/* use of ">" forces the correct sort order */
return a->order_key (Mixer_UI::get_order_key()) < b->order_key (Mixer_UI::get_order_key());
return a->order_key (N_("signal")) < b->order_key (N_("signal"));
}
};

2
gtk2_ardour/mixer_ui.h
View File

@ -80,8 +80,6 @@ class Mixer_UI : public Gtk::Window
RouteRedirectSelection& selection() { return _selection; }
static std::string get_order_key();
private:
ARDOUR::Session *session;