ardour/livetrax
13
0
Fork 0
Code

there is no remote model choice anymore - ordering is determined by the GUI

Browse Source
This commit is contained in:
Paul Davis 2016-06-06 12:04:49 -04:00
parent da5119583a
commit 20d85384c1
6 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_actions.cc
View File

@ -1711,10 +1711,6 @@ Editor::parameter_changed (std::string p)
}
} else if (p == "show-region-gain") {
set_gain_envelope_visibility ();
} else if (p == "remote-model") {
if (_routes) {
_routes->reset_remote_control_ids ();
}
} else if (p == "skip-playback") {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback"));

1
gtk2_ardour/editor_route_groups.cc
View File

@ -518,7 +518,6 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
}
}
}
_editor->_routes->reset_remote_control_ids ();
}
void

9
gtk2_ardour/editor_routes.cc
View File

@ -971,15 +971,6 @@ EditorRoutes::show_track_in_display (TimeAxisView& tv)
}
}
void
EditorRoutes::reset_remote_control_ids ()
{
if (Config->get_remote_model() == UserOrdered || !_session || _session->deletion_in_progress()) {
return;
}
sync_presentation_info_from_treeview ();
}
void
EditorRoutes::sync_presentation_info_from_treeview ()
{

1
gtk2_ardour/editor_routes.h
View File

@ -65,7 +65,6 @@ public:
void hide_all_tracks (bool);
void clear ();
void sync_presentation_info_from_treeview ();
void reset_remote_control_ids ();
private:
void initial_display ();

2
gtk2_ardour/mixer_ui.cc
View File

@ -655,7 +655,7 @@ Mixer_UI::remove_strip (MixerStrip* strip)
void
Mixer_UI::sync_presentation_info_from_treeview ()
{
if (ignore_reorder || !_session || _session->deletion_in_progress() || (Config->get_remote_model() != MixerOrdered)) {
if (ignore_reorder || !_session || _session->deletion_in_progress()) {
return;
}

12
gtk2_ardour/rc_option_editor.cc
View File

@ -2850,18 +2850,6 @@ if (!ARDOUR::Profile->get_mixbus()) {
add_option (_("Control Surfaces"), new ControlSurfacesOptions);
ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
"remote-model",
_("Control surface remote ID"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_remote_model),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_remote_model)
);
rm->add (UserOrdered, _("assigned by user"));
rm->add (MixerOrdered, _("follows order of mixer"));
add_option (_("Control Surfaces"), rm);
/* VIDEO Timeline */
add_option (_("Video"), new VideoTimelineOptions (_rc_config));