there is no remote model choice anymore - ordering is determined by the GUI
This commit is contained in:
parent
da5119583a
commit
20d85384c1
|
@ -1711,10 +1711,6 @@ Editor::parameter_changed (std::string p)
|
||||||
}
|
}
|
||||||
} else if (p == "show-region-gain") {
|
} else if (p == "show-region-gain") {
|
||||||
set_gain_envelope_visibility ();
|
set_gain_envelope_visibility ();
|
||||||
} else if (p == "remote-model") {
|
|
||||||
if (_routes) {
|
|
||||||
_routes->reset_remote_control_ids ();
|
|
||||||
}
|
|
||||||
} else if (p == "skip-playback") {
|
} else if (p == "skip-playback") {
|
||||||
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback"));
|
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback"));
|
||||||
|
|
||||||
|
|
|
@ -518,7 +518,6 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_editor->_routes->reset_remote_control_ids ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -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
|
void
|
||||||
EditorRoutes::sync_presentation_info_from_treeview ()
|
EditorRoutes::sync_presentation_info_from_treeview ()
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,7 +65,6 @@ public:
|
||||||
void hide_all_tracks (bool);
|
void hide_all_tracks (bool);
|
||||||
void clear ();
|
void clear ();
|
||||||
void sync_presentation_info_from_treeview ();
|
void sync_presentation_info_from_treeview ();
|
||||||
void reset_remote_control_ids ();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void initial_display ();
|
void initial_display ();
|
||||||
|
|
|
@ -655,7 +655,7 @@ Mixer_UI::remove_strip (MixerStrip* strip)
|
||||||
void
|
void
|
||||||
Mixer_UI::sync_presentation_info_from_treeview ()
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2850,18 +2850,6 @@ if (!ARDOUR::Profile->get_mixbus()) {
|
||||||
|
|
||||||
add_option (_("Control Surfaces"), new ControlSurfacesOptions);
|
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 */
|
/* VIDEO Timeline */
|
||||||
add_option (_("Video"), new VideoTimelineOptions (_rc_config));
|
add_option (_("Video"), new VideoTimelineOptions (_rc_config));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user