Remove preferences menu options that have been moved into one or other preferences dialog.

git-svn-id: svn://localhost/ardour2/branches/3.0@5085 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 891 deletions

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 882a1f2b87..e20d7521fd 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -86,278 +86,6 @@ ARDOUR_UI::toggle_send_midi_feedback ()
 }
 
 void
-ARDOUR_UI::toggle_denormal_protection ()
-{
-	ActionManager::toggle_config_state ("options", "DenormalProtection", &RCConfiguration::set_denormal_protection, &RCConfiguration::get_denormal_protection);
-}
-
-void
-ARDOUR_UI::toggle_only_copy_imported_files ()
-{
-	ActionManager::toggle_config_state ("options", "OnlyCopyImportedFiles", &RCConfiguration::set_only_copy_imported_files, &RCConfiguration::get_only_copy_imported_files);
-}
-
-
-void
-ARDOUR_UI::set_native_file_header_format (HeaderFormat hf)
-{
-	const char *action = 0;
-
-	switch (hf) {
-	case BWF:
-		action = X_("FileHeaderFormatBWF");
-		break;
-	case WAVE:
-		action = X_("FileHeaderFormatWAVE");
-		break;
-	case WAVE64:
-		action = X_("FileHeaderFormatWAVE64");
-		break;
-	case iXML:
-		action = X_("FileHeaderFormatiXML");
-		break;
-	case RF64:
-		action = X_("FileHeaderFormatRF64");
-		break;
-	case CAF:
-		action = X_("FileHeaderFormatCAF");
-		break;
-	case AIFF:
-		action = X_("FileHeaderFormatAIFF");
-		break;
-	default:
-		fatal << string_compose (_("programming error: %1"), "illegal file header format in ::set_native_file_header_format") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active() && session->config.get_native_file_header_format() != hf) {
-			session->config.set_native_file_header_format (hf);
-		}
-	}
-}
-
-void
-ARDOUR_UI::set_native_file_data_format (SampleFormat sf)
-{
-	const char* action = 0;
-
-	switch (sf) {
-	case FormatFloat:
-		action = X_("FileDataFormatFloat");
-		break;
-	case FormatInt24:
-		action = X_("FileDataFormat24bit");
-		break;
-	case FormatInt16:
-		action = X_("FileDataFormat16bit");
-		break;
-	default:
-		fatal << string_compose (_("programming error: %1"), "illegal file data format in ::set_native_file_data_format") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active() && session->config.get_native_file_data_format() != sf) {
-			session->config.set_native_file_data_format (sf);
-		}
-	}
-}
-
-void
-ARDOUR_UI::set_input_auto_connect (AutoConnectOption option)
-{
-	const char* action;
-
-	switch (option) {
-	case AutoConnectPhysical:
-		action = X_("InputAutoConnectPhysical");
-		break;
-	default:
-		action = X_("InputAutoConnectManual");
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-
-		if (ract && ract->get_active() && Config->get_input_auto_connect() != option) {
-			Config->set_input_auto_connect (option);
-		}
-	}
-}
-
-void
-ARDOUR_UI::set_output_auto_connect (AutoConnectOption option)
-{
-	const char* action;
-
-	switch (option) {
-	case AutoConnectPhysical:
-		action = X_("OutputAutoConnectPhysical");
-		break;
-	case AutoConnectMaster:
-		action = X_("OutputAutoConnectMaster");
-		break;
-	default:
-		action = X_("OutputAutoConnectManual");
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-
-		if (ract && ract->get_active() && Config->get_output_auto_connect() != option) {
-			Config->set_output_auto_connect (option);
-		}
-	}
-}
-
-void
-ARDOUR_UI::set_solo_model (SoloModel model)
-{
-	const char* action = 0;
-
-	switch (model) {
-	case SoloBus:
-		action = X_("SoloViaBus");
-		break;
-
-	case InverseMute:
-		action = X_("SoloInPlace");
-		break;
-	default:
-		fatal << string_compose (_("programming error: unknown solo model in ARDOUR_UI::set_solo_model: %1"), model) << endmsg;
-		/*NOTREACHED*/
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-
-		if (ract && ract->get_active() && Config->get_solo_model() != model) {
-			Config->set_solo_model (model);
-		}
-	}
-
-}
-
-void
-ARDOUR_UI::set_remote_model (RemoteModel model)
-{
-	const char* action = 0;
-
-	switch (model) {
-	case UserOrdered:
-		action = X_("RemoteUserDefined");
-		break;
-	case MixerOrdered:
-		action = X_("RemoteMixerDefined");
-		break;
-	case EditorOrdered:
-		action = X_("RemoteEditorDefined");
-		break;
-
-	default:
-		fatal << string_compose (_("programming error: unknown remote model in ARDOUR_UI::set_remote_model: %1"), model) << endmsg;
-		/*NOTREACHED*/
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-
-		if (ract && ract->get_active() && Config->get_remote_model() != model) {
-			Config->set_remote_model (model);
-		}
-	}
-
-}
-
-void
-ARDOUR_UI::set_monitor_model (MonitorModel model)
-{
-	const char* action = 0;
-
-	switch (model) {
-	case HardwareMonitoring:
-		action = X_("UseHardwareMonitoring");
-		break;
-
-	case SoftwareMonitoring:
-		action = X_("UseSoftwareMonitoring");
-		break;
-	case ExternalMonitoring:
-		action = X_("UseExternalMonitoring");
-		break;
-
-	default:
-		fatal << string_compose (_("programming error: unknown monitor model in ARDOUR_UI::set_monitor_model: %1"), model) << endmsg;
-		/*NOTREACHED*/
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-
-		if (ract && ract->get_active() && Config->get_monitoring_model() != model) {
-			Config->set_monitoring_model (model);
-		}
-	}
-
-}
-
-void
-ARDOUR_UI::set_denormal_model (DenormalModel model)
-{
-	const char* action = 0;
-
-	switch (model) {
-	case DenormalNone:
-		action = X_("DenormalNone");
-		break;
-
-	case DenormalFTZ:
-		action = X_("DenormalFTZ");
-		break;
-
-	case DenormalDAZ:
-		action = X_("DenormalDAZ");
-		break;
-
-	case DenormalFTZDAZ:
-		action = X_("DenormalFTZDAZ");
-		break;
-
-	default:
-		fatal << string_compose (_("programming error: unknown denormal model in ARDOUR_UI::set_denormal_model: %1"), model) << endmsg;
-		/*NOTREACHED*/
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-
-		if (ract && ract->get_active() && Config->get_denormal_model() != model) {
-			Config->set_denormal_model (model);
-		}
-	}
-
-}
-
-void
 ARDOUR_UI::toggle_auto_input ()
 {
 	ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::set_auto_input), mem_fun (session->config, &SessionConfiguration::get_auto_input));
@@ -480,144 +208,6 @@ ARDOUR_UI::toggle_editing_space()
 }
 
 void
-ARDOUR_UI::toggle_new_plugins_active ()
-{
-	ActionManager::toggle_config_state ("options", "NewPluginsActive", &RCConfiguration::set_new_plugins_active, &RCConfiguration::get_new_plugins_active);
-}
-
-void
-ARDOUR_UI::toggle_StopPluginsWithTransport()
-{
-	ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &RCConfiguration::set_plugins_stop_with_transport, &RCConfiguration::get_plugins_stop_with_transport);
-}
-
-void
-ARDOUR_UI::toggle_LatchedRecordEnable()
-{
-	ActionManager::toggle_config_state ("options", "LatchedRecordEnable", &RCConfiguration::set_latched_record_enable, &RCConfiguration::get_latched_record_enable);
-}
-
-void
-ARDOUR_UI::toggle_RegionEquivalentsOverlap()
-{
-	ActionManager::toggle_config_state ("options", "RegionEquivalentsOverlap", &RCConfiguration::set_use_overlap_equivalency, &RCConfiguration::get_use_overlap_equivalency);
-}
-
-void
-ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording()
-{
-	ActionManager::toggle_config_state ("options", "DoNotRunPluginsWhileRecording", &RCConfiguration::set_do_not_record_plugins, &RCConfiguration::get_do_not_record_plugins);
-}
-
-void
-ARDOUR_UI::toggle_VerifyRemoveLastCapture()
-{
-	ActionManager::toggle_config_state ("options", "VerifyRemoveLastCapture", &RCConfiguration::set_verify_remove_last_capture, &RCConfiguration::get_verify_remove_last_capture);
-}
-
-void
-ARDOUR_UI::toggle_PeriodicSafetyBackups()
-{
-	ActionManager::toggle_config_state ("options", "PeriodicSafetyBackups", &RCConfiguration::set_periodic_safety_backups, &RCConfiguration::get_periodic_safety_backups);
-}
-
-void
-ARDOUR_UI::toggle_StopRecordingOnXrun()
-{
-	ActionManager::toggle_config_state ("options", "StopRecordingOnXrun", &RCConfiguration::set_stop_recording_on_xrun, &RCConfiguration::get_stop_recording_on_xrun);
-}
-
-void
-ARDOUR_UI::toggle_CreateXrunMarker()
-{
-	ActionManager::toggle_config_state ("options", "CreateXrunMarker", &RCConfiguration::set_create_xrun_marker, &RCConfiguration::get_create_xrun_marker);
-}
-
-void
-ARDOUR_UI::toggle_sync_order_keys ()
-{
-	ActionManager::toggle_config_state ("options", "SyncEditorAndMixerTrackOrder", &RCConfiguration::set_sync_all_route_ordering, &RCConfiguration::get_sync_all_route_ordering);
-}
-
-void
-ARDOUR_UI::toggle_StopTransportAtEndOfSession()
-{
-	ActionManager::toggle_config_state ("options", "StopTransportAtEndOfSession", &RCConfiguration::set_stop_at_session_end, &RCConfiguration::get_stop_at_session_end);
-}
-
-void
-ARDOUR_UI::toggle_GainReduceFastTransport()
-{
-	ActionManager::toggle_config_state ("options", "GainReduceFastTransport", &RCConfiguration::set_quieten_at_speed, &RCConfiguration::get_quieten_at_speed);
-}
-
-void
-ARDOUR_UI::toggle_LatchedSolo()
-{
-	ActionManager::toggle_config_state ("options", "LatchedSolo", &RCConfiguration::set_solo_latched, &RCConfiguration::get_solo_latched);
-}
-
-void
-ARDOUR_UI::toggle_ShowSoloMutes()
-{
-	ActionManager::toggle_config_state ("options", "ShowSoloMutes", &RCConfiguration::set_show_solo_mutes, &RCConfiguration::get_show_solo_mutes);
-}
-
-void
-ARDOUR_UI::toggle_SoloMuteOverride()
-{
-	ActionManager::toggle_config_state ("options", "SoloMuteOverride", &RCConfiguration::set_solo_mute_override, &RCConfiguration::get_solo_mute_override);
-}
-
-void
-ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor()
-{
-	ActionManager::toggle_config_state ("options", "PrimaryClockDeltaEditCursor", &RCConfiguration::set_primary_clock_delta_edit_cursor, &RCConfiguration::get_primary_clock_delta_edit_cursor);
-}
-
-void
-ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor()
-{
-	ActionManager::toggle_config_state ("options", "SecondaryClockDeltaEditCursor", &RCConfiguration::set_secondary_clock_delta_edit_cursor, &RCConfiguration::get_secondary_clock_delta_edit_cursor);
-}
-
-void
-ARDOUR_UI::toggle_ShowTrackMeters()
-{
-	ActionManager::toggle_config_state ("options", "ShowTrackMeters", &RCConfiguration::set_show_track_meters, &RCConfiguration::get_show_track_meters);
-}
-
-void
-ARDOUR_UI::toggle_TapeMachineMode ()
-{
-	ActionManager::toggle_config_state ("options", "ToggleTapeMachineMode", &RCConfiguration::set_tape_machine_mode, &RCConfiguration::get_tape_machine_mode);
-}
-
-void
-ARDOUR_UI::toggle_use_narrow_ms()
-{
-	ActionManager::toggle_config_state ("options", "DefaultNarrowMS", &RCConfiguration::set_default_narrow_ms, &RCConfiguration::get_default_narrow_ms);
-}
-
-void
-ARDOUR_UI::toggle_NameNewMarkers()
-{
-	ActionManager::toggle_config_state ("options", "NameNewMarkers", &RCConfiguration::set_name_new_markers, &RCConfiguration::get_name_new_markers);
-}
-
-void
-ARDOUR_UI::toggle_rubberbanding_snaps_to_grid ()
-{
-	ActionManager::toggle_config_state ("options", "RubberbandingSnapsToGrid", &RCConfiguration::set_rubberbanding_snaps_to_grid, &RCConfiguration::get_rubberbanding_snaps_to_grid);
-}
-
-void
-ARDOUR_UI::toggle_auto_analyse_audio ()
-{
-	ActionManager::toggle_config_state ("options", "AutoAnalyseAudio", &RCConfiguration::set_auto_analyse_audio, &RCConfiguration::get_auto_analyse_audio);
-}
-
-void
 ARDOUR_UI::mtc_port_changed ()
 {
 	bool have_mtc;
@@ -660,420 +250,6 @@ ARDOUR_UI::setup_session_options ()
 	Config->ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed));
 }
 
-
-void
-ARDOUR_UI::map_solo_model ()
-{
-	const char* on;
-
-	if (Config->get_solo_model() == InverseMute) {
-		on = X_("SoloInPlace");
-	} else {
-		on = X_("SoloViaBus");
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_monitor_model ()
-{
-	const char* on = 0;
-
-	switch (Config->get_monitoring_model()) {
-	case HardwareMonitoring:
-		on = X_("UseHardwareMonitoring");
-		break;
-	case SoftwareMonitoring:
-		on = X_("UseSoftwareMonitoring");
-		break;
-	case ExternalMonitoring:
-		on = X_("UseExternalMonitoring");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_denormal_protection ()
-{
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", X_("DenormalProtection"));
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (Config->get_denormal_protection());
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_denormal_model ()
-{
-	const char* on = 0;
-
-	switch (Config->get_denormal_model()) {
-	case DenormalNone:
-		on = X_("DenormalNone");
-		break;
-	case DenormalFTZ:
-		on = X_("DenormalFTZ");
-		break;
-	case DenormalDAZ:
-		on = X_("DenormalDAZ");
-		break;
-	case DenormalFTZDAZ:
-		on = X_("DenormalFTZDAZ");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_remote_model ()
-{
-	const char* on = 0;
-
-	switch (Config->get_remote_model()) {
-	case UserOrdered:
-		on = X_("RemoteUserDefined");
-		break;
-	case MixerOrdered:
-		on = X_("RemoteMixerDefined");
-		break;
-	case EditorOrdered:
-		on = X_("RemoteEditorDefined");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_file_header_format ()
-{
-	const char* action = 0;
-
-	switch (session->config.get_native_file_header_format()) {
-	case BWF:
-		action = X_("FileHeaderFormatBWF");
-		break;
-
-	case WAVE:
-		action = X_("FileHeaderFormatWAVE");
-		break;
-
-	case WAVE64:
-		action = X_("FileHeaderFormatWAVE64");
-		break;
-
-	case iXML:
-		action = X_("FileHeaderFormatiXML");
-		break;
-
-	case RF64:
-		action = X_("FileHeaderFormatRF64");
-		break;
-
-	case CAF:
-		action = X_("FileHeaderFormatCAF");
-		break;
-
-	default:
-		fatal << string_compose (_("programming error: unknown file header format passed to ARDOUR_UI::map_file_data_format: %1"),
-					 session->config.get_native_file_header_format()) << endmsg;
-		/*NOTREACHED*/
-	}
-
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_file_data_format ()
-{
-	const char* action = 0;
-
-	switch (session->config.get_native_file_data_format()) {
-	case FormatFloat:
-		action = X_("FileDataFormatFloat");
-		break;
-
-	case FormatInt24:
-		action = X_("FileDataFormat24bit");
-		break;
-
-	case FormatInt16:
-		action = X_("FileDataFormat16bit");
-		break;
-
-	default:
-		fatal << string_compose (_("programming error: unknown file data format passed to ARDOUR_UI::map_file_data_format: %1"),
-					 session->config.get_native_file_data_format()) << endmsg;
-		/*NOTREACHED*/
-	}
-
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
-
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_input_auto_connect ()
-{
-	const char* on;
-
-	if (Config->get_input_auto_connect() == (AutoConnectOption) 0) {
-		on = "InputAutoConnectManual";
-	} else {
-		on = "InputAutoConnectPhysical";
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_output_auto_connect ()
-{
-	const char* on;
-
-	if (Config->get_output_auto_connect() == (AutoConnectOption) 0) {
-		on = "OutputAutoConnectManual";
-	} else if (Config->get_output_auto_connect() == AutoConnectPhysical) {
-		on = "OutputAutoConnectPhysical";
-	} else {
-		on = "OutputAutoConnectMaster";
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_only_copy_imported_files ()
-{
-	Glib::RefPtr<Action> act = ActionManager::get_action ("options", X_("OnlyCopyImportedFiles"));
-	if (act) {
-		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-		if (tact && !tact->get_active()) {
-			tact->set_active (Config->get_only_copy_imported_files());
-		}
-	}
-
-}
-
-
-void
-ARDOUR_UI::map_meter_falloff ()
-{
-	const char* action = X_("MeterFalloffMedium");
-
-	float val = Config->get_meter_falloff ();
-	MeterFalloff code = meter_falloff_from_float(val);
-
-	switch (code) {
-	case MeterFalloffOff:
-		action = X_("MeterFalloffOff");
-		break;
-	case MeterFalloffSlowest:
-		action = X_("MeterFalloffSlowest");
-		break;
-	case MeterFalloffSlow:
-		action = X_("MeterFalloffSlow");
-		break;
-	case MeterFalloffMedium:
-		action = X_("MeterFalloffMedium");
-		break;
-	case MeterFalloffFast:
-		action = X_("MeterFalloffFast");
-		break;
-	case MeterFalloffFaster:
-		action = X_("MeterFalloffFaster");
-		break;
-	case MeterFalloffFastest:
-		action = X_("MeterFalloffFastest");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::map_meter_hold ()
-{
-	const char* action = X_("MeterHoldMedium");
-
-	/* XXX hack alert. Fix this. Please */
-
-	float val = Config->get_meter_hold ();
-	MeterHold code = (MeterHold) (int) (floor (val));
-
-	switch (code) {
-	case MeterHoldOff:
-		action = X_("MeterHoldOff");
-		break;
-	case MeterHoldShort:
-		action = X_("MeterHoldShort");
-		break;
-	case MeterHoldMedium:
-		action = X_("MeterHoldMedium");
-		break;
-	case MeterHoldLong:
-		action = X_("MeterHoldLong");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-void
-ARDOUR_UI::set_meter_hold (MeterHold val)
-{
-	const char* action = 0;
-	float fval;
-
-	fval = meter_hold_to_float (val);
-
-	switch (val) {
-	case MeterHoldOff:
-		action = X_("MeterHoldOff");
-		break;
-	case MeterHoldShort:
-		action = X_("MeterHoldShort");
-		break;
-	case MeterHoldMedium:
-		action = X_("MeterHoldMedium");
-		break;
-	case MeterHoldLong:
-		action = X_("MeterHoldLong");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active() && Config->get_meter_hold() != fval) {
-			Config->set_meter_hold (fval);
-		}
-	}
-}
-
-void
-ARDOUR_UI::set_meter_falloff (MeterFalloff val)
-{
-	const char* action = 0;
-	float fval;
-
-	fval = meter_falloff_to_float (val);
-
-	switch (val) {
-	case MeterFalloffOff:
-		action = X_("MeterFalloffOff");
-		break;
-	case MeterFalloffSlowest:
-		action = X_("MeterFalloffSlowest");
-		break;
-	case MeterFalloffSlow:
-		action = X_("MeterFalloffSlow");
-		break;
-	case MeterFalloffMedium:
-		action = X_("MeterFalloffMedium");
-		break;
-	case MeterFalloffFast:
-		action = X_("MeterFalloffFast");
-		break;
-	case MeterFalloffFaster:
-		action = X_("MeterFalloffFaster");
-		break;
-	case MeterFalloffFastest:
-		action = X_("MeterFalloffFastest");
-		break;
-	}
-
-	Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action);
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active() && Config->get_meter_falloff () != fval) {
-			Config->set_meter_falloff (fval);
-		}
-	}
-}
-
 void
 ARDOUR_UI::parameter_changed (std::string p)
 {
@@ -1120,26 +296,12 @@ ARDOUR_UI::parameter_changed (std::string p)
 		ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control);
 	} else if (p == "midi-feedback") {
 		ActionManager::map_some_state ("options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback);
-	} else if (p == "do-not-record-plugins") {
-		ActionManager::map_some_state ("options", "DoNotRunPluginsWhileRecording", &RCConfiguration::get_do_not_record_plugins);
-	} else if (p == "latched-record-enable") {
-		ActionManager::map_some_state ("options", "LatchedRecordEnable", &RCConfiguration::get_latched_record_enable);
-	} else if (p == "solo-latched") {
-		ActionManager::map_some_state ("options", "LatchedSolo", &RCConfiguration::get_solo_latched);
-	} else if (p == "show-solo-mutes") {
-		ActionManager::map_some_state ("options", "ShowSoloMutes", &RCConfiguration::get_show_solo_mutes);
-	} else if (p == "solo-mute-override") {
-		ActionManager::map_some_state ("options", "SoloMuteOverride", &RCConfiguration::get_solo_mute_override);
-	} else if (p == "solo-model") {
-		map_solo_model ();
 	} else if (p == "auto-play") {
 		ActionManager::map_some_state ("Transport", "ToggleAutoPlay", mem_fun (session->config, &SessionConfiguration::get_auto_play));
 	} else if (p == "auto-return") {
 		ActionManager::map_some_state ("Transport", "ToggleAutoReturn", mem_fun (session->config, &SessionConfiguration::get_auto_return));
 	} else if (p == "auto-input") {
 		ActionManager::map_some_state ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::get_auto_input));
-	} else if (p == "tape-machine-mode") {
-		ActionManager::map_some_state ("options", "ToggleTapeMachineMode", &RCConfiguration::get_tape_machine_mode);
 	} else if (p == "punch-out") {
 		ActionManager::map_some_state ("Transport", "TogglePunchOut", mem_fun (session->config, &SessionConfiguration::get_punch_out));
 		if (!session->config.get_punch_out()) {
@@ -1154,36 +316,8 @@ ARDOUR_UI::parameter_changed (std::string p)
 		ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking);
 	} else if (p == "jack-time-master") {
 		ActionManager::map_some_state ("Transport",  "ToggleTimeMaster", mem_fun (session->config, &SessionConfiguration::get_jack_time_master));
-	} else if (p == "plugins-stop-with-transport") {
-		ActionManager::map_some_state ("options",  "StopPluginsWithTransport", &RCConfiguration::get_plugins_stop_with_transport);
-	} else if (p == "new-plugins-active") {
-		ActionManager::map_some_state ("options",  "NewPluginsActive", &RCConfiguration::get_new_plugins_active);
-	} else if (p == "latched-record-enable") {
-		ActionManager::map_some_state ("options", "LatchedRecordEnable", &RCConfiguration::get_latched_record_enable);
-	} else if (p == "verify-remove-last-capture") {
-		ActionManager::map_some_state ("options",  "VerifyRemoveLastCapture", &RCConfiguration::get_verify_remove_last_capture);
-	} else if (p == "periodic-safety-backups") {
-		ActionManager::map_some_state ("options",  "PeriodicSafetyBackups", &RCConfiguration::get_periodic_safety_backups);
-	} else if (p == "stop-recording-on-xrun") {
-		ActionManager::map_some_state ("options",  "StopRecordingOnXrun", &RCConfiguration::get_stop_recording_on_xrun);
-	} else if (p == "create-xrun-marker") {
-		ActionManager::map_some_state ("options",  "CreateXrunMarker", &RCConfiguration::get_create_xrun_marker);
-	} else if (p == "sync-all-route-ordering") {
-		ActionManager::map_some_state ("options",  "SyncEditorAndMixerTrackOrder", &RCConfiguration::get_sync_all_route_ordering);
-	} else if (p == "stop-at-session-end") {
-		ActionManager::map_some_state ("options",  "StopTransportAtEndOfSession", &RCConfiguration::get_stop_at_session_end);
-	} else if (p == "monitoring-model") {
-		map_monitor_model ();
-	} else if (p == "denormal-model") {
-		map_denormal_model ();
-	} else if (p == "denormal-protection") {
-		map_denormal_protection ();
-	} else if (p == "remote-model") {
-		map_remote_model ();
 	} else if (p == "use-video-sync") {
 		ActionManager::map_some_state ("Transport",  "ToggleVideoSync", mem_fun (session->config, &SessionConfiguration::get_use_video_sync));
-	} else if (p == "quieten-at-speed") {
-		ActionManager::map_some_state ("options",  "GainReduceFastTransport", &RCConfiguration::get_quieten_at_speed);
 	} else if (p == "shuttle-behaviour") {
 
 		switch (Config->get_shuttle_behaviour ()) {
@@ -1213,18 +347,6 @@ ARDOUR_UI::parameter_changed (std::string p)
 			shuttle_units_button.set_label(_("ST"));
 			break;
 		}
-	} else if (p == "input-auto-connect") {
-		map_input_auto_connect ();
-	} else if (p == "output-auto-connect") {
-		map_output_auto_connect ();
-	} else if (p == "native-file-header-format") {
-		map_file_header_format ();
-	} else if (p == "native-file-data-format") {
-		map_file_data_format ();
-	} else if (p == "meter-hold") {
-		map_meter_hold ();
-	} else if (p == "meter-falloff") {
-		map_meter_falloff ();
 	} else if (p == "video-pullup" || p == "smpte-format") {
 		if (session) {
 			primary_clock.set (session->audible_frame(), true);
@@ -1233,20 +355,7 @@ ARDOUR_UI::parameter_changed (std::string p)
 			primary_clock.set (0, true);
 			secondary_clock.set (0, true);
 		}
-	} else if (p == "use-overlap-equivalency") {
-		ActionManager::map_some_state ("options", "RegionEquivalentsOverlap", &RCConfiguration::get_use_overlap_equivalency);
-	} else if (p == "primary-clock-delta-edit-cursor") {
-		ActionManager::map_some_state ("options",  "PrimaryClockDeltaEditCursor", &RCConfiguration::get_primary_clock_delta_edit_cursor);
-	} else if (p == "secondary-clock-delta-edit-cursor") {
-		ActionManager::map_some_state ("options",  "SecondaryClockDeltaEditCursor", &RCConfiguration::get_secondary_clock_delta_edit_cursor);
-	} else if (p == "only-copy-imported-files") {
-		map_only_copy_imported_files ();
 	} else if (p == "show-track-meters") {
-		ActionManager::map_some_state ("options",  "ShowTrackMeters", &RCConfiguration::get_show_track_meters);
 		editor->toggle_meter_updating();
-	} else if (p == "default-narrow_ms") {
-		ActionManager::map_some_state ("options",  "DefaultNarrowMS", &RCConfiguration::get_default_narrow_ms);
-	} else if (p =="rubberbanding-snaps-to-grid") {
-		ActionManager::map_some_state ("options", "RubberbandingSnapsToGrid", &RCConfiguration::get_rubberbanding_snaps_to_grid);
 	}
 }