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, 509 deletions

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 91bf421d44..87b354eb28 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -100,8 +100,6 @@ Editor::register_actions ()
 
 	/* add named actions for the editor */
 
-	ActionManager::register_toggle_action (editor_actions, "link-region-and-track-selection", _("Link Region/Track Selection"), mem_fun (*this, &Editor::toggle_link_region_and_track_selection));
-	ActionManager::register_toggle_action (editor_actions, "automation-follows-regions", _("Automation Follows Regions"), mem_fun (*this, &Editor::toggle_automation_follows_regions));
 	ActionManager::register_action (editor_actions, "break-drag", _("Break drag"), mem_fun (*this, &Editor::break_drag));
 
 	act = ActionManager::register_toggle_action (editor_actions, "show-editor-mixer", _("Show Editor Mixer"), mem_fun (*this, &Editor::editor_mixer_button_toggled));
@@ -109,24 +107,6 @@ Editor::register_actions ()
 	act = ActionManager::register_toggle_action (editor_actions, "show-editor-list", _("Show Editor List"), mem_fun (*this, &Editor::editor_list_button_toggled));
 	ActionManager::session_sensitive_actions.push_back (act);
 
-	RadioAction::Group crossfade_model_group;
-
-	act = ActionManager::register_radio_action (editor_actions, crossfade_model_group, "CrossfadesFull", _("Span Entire Overlap"), bind (mem_fun(*this, &Editor::set_crossfade_model), FullCrossfade));
-	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (editor_actions, crossfade_model_group, "CrossfadesShort", _("Short"), bind (mem_fun(*this, &Editor::set_crossfade_model), ShortCrossfade));
-	ActionManager::session_sensitive_actions.push_back (act);
-
-	act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-active", _("Active"), mem_fun(*this, &Editor::toggle_xfades_active));
-	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-visible", _("Show"), mem_fun(*this, &Editor::toggle_xfade_visibility));
-	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (editor_actions, "toggle-auto-xfades", _("Created Automatically"), mem_fun(*this, &Editor::toggle_auto_xfade));
-	ActionManager::session_sensitive_actions.push_back (act);
-
-	act = ActionManager::register_toggle_action (editor_actions, "toggle-region-fades", _("Use Region Fades (global)"), mem_fun(*this, &Editor::toggle_region_fades));
-	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (editor_actions, "toggle-region-fades-visible", _("Show Region Fades"), mem_fun(*this, &Editor::toggle_region_fades_visible));
-	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "toggle-selected-region-fade-in", _("Toggle Region Fade In"), bind (mem_fun(*this, &Editor::toggle_selected_region_fades), 1));;
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (editor_actions, "toggle-selected-region-fade-out", _("Toggle Region Fade Out"), bind (mem_fun(*this, &Editor::toggle_selected_region_fades), -1));;
@@ -844,44 +824,6 @@ Editor::register_actions ()
 	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 	tact->set_active (true);
 
-	RadioAction::Group layer_model_group;
-
-	ActionManager::register_radio_action (editor_actions, layer_model_group,  X_("LayerLaterHigher"), _("Later is Higher"), bind (mem_fun (*this, &Editor::set_layer_model), LaterHigher));
-	ActionManager::register_radio_action (editor_actions, layer_model_group,  X_("LayerMoveAddHigher"), _("Most Recently Moved/Added is Higher"), bind (mem_fun (*this, &Editor::set_layer_model), MoveAddHigher));
-	ActionManager::register_radio_action (editor_actions, layer_model_group,  X_("LayerAddHigher"), _("Most Recently Added is Higher"), bind (mem_fun (*this, &Editor::set_layer_model), AddHigher));
-
-	RadioAction::Group smpte_group;
-
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte23976"), _("23.976"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_23976));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte24"), _("24"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_24));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte24976"), _("24.976"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_24976));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte25"), _("25"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_25));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte2997"), _("29.97"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_2997));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte2997drop"), _("29.97 drop"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_2997drop));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte30"), _("30"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_30));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte30drop"), _("30 drop"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_30drop));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte5994"), _("59.94"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_5994));
-	ActionManager::register_radio_action (editor_actions, smpte_group,  X_("Smpte60"), _("60"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_60));
-
-	RadioAction::Group pullup_group;
-
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupPlus4Plus1"), _("+4.1667% + 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus4Plus1));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupPlus4"), _("+4.1667%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus4));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupPlus4Minus1"), _("+4.1667% - 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus4Minus1));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupPlus1"), _("+ 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus1));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupNone"), _("None"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_None));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupMinus1"), _("- 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus1));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupMinus4Plus1"), _("-4.1667% + 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus4Plus1));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupMinus4"), _("-4.1667%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus4));
-	ActionManager::register_radio_action (editor_actions, pullup_group,  X_("PullupMinus4Minus1"), _("-4.1667% - 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus4Minus1));
-
-	RadioAction::Group subframe_group;
-
-	ActionManager::register_radio_action (editor_actions, subframe_group,  X_("Subframes80"), _("80 per frame"), bind (mem_fun (*this, 
-&Editor::subframes_per_frame_chosen), 80));
-	ActionManager::register_radio_action (editor_actions, subframe_group,  X_("Subframes100"), _("100 per frame"), bind (mem_fun (*this, 
-&Editor::subframes_per_frame_chosen), 100));
-
 	ActionManager::add_action_group (rl_actions);
 	ActionManager::add_action_group (ruler_actions);
 	ActionManager::add_action_group (zoom_actions);
@@ -1014,206 +956,6 @@ Editor::waveform_scale_chosen (Editing::WaveformScale ws)
 	}
 }
 
-void
-Editor::set_crossfade_model (CrossfadeModel model)
-{
-	RefPtr<Action> act;
-
-	/* this is driven by a toggle on a radio group, and so is invoked twice,
-	   once for the item that became inactive and once for the one that became
-	   active.
-	*/
-
-	switch (model) {
-	case FullCrossfade:
-		act = ActionManager::get_action (X_("Editor"), X_("CrossfadesFull"));
-		break;
-	case ShortCrossfade:
-		act = ActionManager::get_action (X_("Editor"), X_("CrossfadesShort"));
-		break;
-	}
-	
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active()) {
-			session->config.set_xfade_model (model);
-		}
-	}
-}
-
-void
-Editor::update_crossfade_model ()
-{
-	RefPtr<Action> act;
-
-	switch (session->config.get_xfade_model()) {
-	case FullCrossfade:
-		act = ActionManager::get_action (X_("Editor"), X_("CrossfadesFull"));
-		break;
-	case ShortCrossfade:
-		act = ActionManager::get_action (X_("Editor"), X_("CrossfadesShort"));
-		break;
-	}
-
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-
-void
-Editor::update_smpte_mode ()
-{
-	ENSURE_GUI_THREAD(mem_fun(*this, &Editor::update_smpte_mode));
-
-	RefPtr<Action> act;
-	const char* action = 0;
-
-	switch (session->config.get_smpte_format()) {
-	case smpte_23976:
-		action = X_("Smpte23976");
-		break;
-	case smpte_24:
-		action = X_("Smpte24");
-		break;
-	case smpte_24976:
-		action = X_("Smpte24976");
-		break;
-	case smpte_25:
-		action = X_("Smpte25");
-		break;
-	case smpte_2997:
-		action = X_("Smpte2997");
-		break;
-	case smpte_2997drop:
-		action = X_("Smpte2997drop");
-		break;
-	case smpte_30:
-		action = X_("Smpte30");
-		break;
-	case smpte_30drop:
-		action = X_("Smpte30drop");
-		break;
-	case smpte_5994:
-		action = X_("Smpte5994");
-		break;
-	case smpte_60:
-		action = X_("Smpte60");
-		break;
-	}
-
-	act = ActionManager::get_action (X_("Editor"), action);
-
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-void
-Editor::update_video_pullup ()
-{
-	ENSURE_GUI_THREAD (mem_fun(*this, &Editor::update_video_pullup));
-
-	RefPtr<Action> act;
-	const char* action = 0;
-
-	float pullup = session->config.get_video_pullup();
-
-	if ( pullup < (-4.1667 - 0.1) * 0.99) {
-		action = X_("PullupMinus4Minus1");
-	} else if ( pullup < (-4.1667) * 0.99 ) {
-		action = X_("PullupMinus4");
-	} else if ( pullup < (-4.1667 + 0.1) * 0.99 ) {
-		action = X_("PullupMinus4Plus1");
-	} else if ( pullup < (-0.1) * 0.99 ) {
-		action = X_("PullupMinus1");
-	} else if (pullup > (4.1667 + 0.1) * 0.99 ) {
-		action = X_("PullupPlus4Plus1");
-	} else if ( pullup > (4.1667) * 0.99 ) {
-		action = X_("PullupPlus4");
-	} else if ( pullup > (4.1667 - 0.1) * 0.99) {
-		action = X_("PullupPlus4Minus1");
-	} else if ( pullup > (0.1) * 0.99 ) {
-		action = X_("PullupPlus1");
-	} else {
-		action = X_("PullupNone");
-	}
-
-	act = ActionManager::get_action (X_("Editor"), action);
-
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-void
-Editor::update_layering_model ()
-{
-	RefPtr<Action> act;
-
-	assert (session);
-
-	switch (session->config.get_layer_model()) {
-	case LaterHigher:
-		act = ActionManager::get_action (X_("Editor"), X_("LayerLaterHigher"));
-		break;
-	case MoveAddHigher:
-		act = ActionManager::get_action (X_("Editor"), X_("LayerMoveAddHigher"));
-		break;
-	case AddHigher:
-		act = ActionManager::get_action (X_("Editor"), X_("LayerAddHigher"));
-		break;
-	}
-
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-void
-Editor::set_layer_model (LayerModel model)
-{
-	/* this is driven by a toggle on a radio group, and so is invoked twice,
-	   once for the item that became inactive and once for the one that became
-	   active.
-	*/
-
-	assert (session);
-
-	RefPtr<Action> act;
-
-	switch (model) {
-	case LaterHigher:
-		act = ActionManager::get_action (X_("Editor"), X_("LayerLaterHigher"));
-		break;
-	case MoveAddHigher:
-		act = ActionManager::get_action (X_("Editor"), X_("LayerMoveAddHigher"));
-		break;
-	case AddHigher:
-		act = ActionManager::get_action (X_("Editor"), X_("LayerAddHigher"));
-		break;
-	}
-	
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active() && session->config.get_layer_model() != model) {
-			session->config.set_layer_model (model);
-		}
-	}
-}
-
 RefPtr<RadioAction>
 Editor::snap_type_action (SnapType type)
 {
@@ -1539,237 +1281,6 @@ Editor::zoom_focus_chosen (ZoomFocus focus)
 	}
 }
 
-void
-Editor::smpte_fps_chosen (SmpteFormat format)
-{
-	/* this is driven by a toggle on a radio group, and so is invoked twice,
-	   once for the item that became inactive and once for the one that became
-	   active.
-	*/
-
-	if (session) {
-
-		RefPtr<Action> act;
-
-		switch (format) {
-			case smpte_23976: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte23976"));
-			 break;
-			case smpte_24: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte24"));
-			 break;
-			case smpte_24976: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte24976"));
-			 break;
-			case smpte_25: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte25"));
-			 break;
-			case smpte_2997: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte2997"));
-			 break;
-			case smpte_2997drop: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte2997drop"));
-			 break;
-			case smpte_30: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte30"));
-			 break;
-			case smpte_30drop: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte30drop"));
-			 break;
-			case smpte_5994: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte5994"));
-			 break;
-			case smpte_60: 
-				act = ActionManager::get_action (X_("Editor"), X_("Smpte60"));
-			 break;
-			default:
-				cerr << "Editor received unexpected smpte type" << endl;
-		}
-
-		if (act) {
-			RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-			if (ract && ract->get_active()) {
-			        session->set_smpte_format (format);
-			}
-		}
-	}
-}
-
-void
-Editor::video_pullup_chosen (Session::PullupFormat pullup)
-{
-	/* this is driven by a toggle on a radio group, and so is invoked twice,
-	   once for the item that became inactive and once for the one that became
-	   active.
-	*/
-
-	const char* action = 0;
-
-	RefPtr<Action> act;
-	
-	float pull = 0.0;
-	
-	switch (pullup) {
-	case Session::pullup_Plus4Plus1:
-		pull = 4.1667 + 0.1;
-		action = X_("PullupPlus4Plus1");
-		break;
-	case Session::pullup_Plus4:
-		pull = 4.1667;
-		action = X_("PullupPlus4");
-		break;
-	case Session::pullup_Plus4Minus1:
-		pull = 4.1667 - 0.1;
-		action = X_("PullupPlus4Minus1");
-		break;
-	case Session::pullup_Plus1:
-		pull = 0.1;
-		action = X_("PullupPlus1");
-		break;
-	case Session::pullup_None:
-		pull = 0.0;
-		action = X_("PullupNone");
-		break;
-	case Session::pullup_Minus1:
-		pull = -0.1;
-		action = X_("PullupMinus1");
-		break;
-	case Session::pullup_Minus4Plus1:
-		pull = -4.1667 + 0.1;
-		action = X_("PullupMinus4Plus1");
-		break;
-	case Session::pullup_Minus4:
-		pull = -4.1667;
-		action = X_("PullupMinus4");
-		break;
-	case Session::pullup_Minus4Minus1:
-		pull = -4.1667 - 0.1;
-		action = X_("PullupMinus4Minus1");
-		break;
-	default:
-		fatal << string_compose (_("programming error: %1"), "Session received unexpected pullup type") << endmsg;
-		/*NOTREACHED*/
-	}
-	
-	act = ActionManager::get_action (X_("Editor"), action);
-	
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active()) {
-			session->config.set_video_pullup ( pull );
-		}
-		
-	} else  {
-		error << string_compose (_("programming error: %1"), "Editor::video_pullup_chosen could not find action to match pullup.") << endmsg;
-	}
-}
-
-void
-Editor::update_subframes_per_frame ()
-{
-	ENSURE_GUI_THREAD (mem_fun(*this, &Editor::update_subframes_per_frame));
-
-	RefPtr<Action> act;
-	const char* action = 0;
-
-	uint32_t const sfpf = session->config.get_subframes_per_frame();
-
-	if (sfpf == 80) {
-		action = X_("Subframes80");
-	} else if (sfpf == 100) {
-		action = X_("Subframes100");
-	} else {
-		warning << string_compose (_("Configuraton is using unhandled subframes per frame value: %1"), sfpf) << endmsg;
-		/*NOTREACHED*/
-		return;
-	}
-
-	act = ActionManager::get_action (X_("Editor"), action);
-
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && !ract->get_active()) {
-			ract->set_active (true);
-		}
-	}
-}
-
-void
-Editor::subframes_per_frame_chosen (uint32_t sfpf)
-{
-	/* this is driven by a toggle on a radio group, and so is invoked twice,
-	   once for the item that became inactive and once for the one that became
-	   active.
-	*/
-
-	const char* action = 0;
-
-	RefPtr<Action> act;
-	
-	if (sfpf == 80) {
-		action = X_("Subframes80");
-	} else if (sfpf == 100) {	
-		action = X_("Subframes100");
-	} else {
-		fatal << string_compose (_("programming error: %1 %2"), "Session received unexpected subframes per frame value: ", sfpf) << endmsg;
-		/*NOTREACHED*/
-	}
-	
-	act = ActionManager::get_action (X_("Editor"), action);
-	
-	if (act) {
-		RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-		if (ract && ract->get_active()) {
-			session->config.set_subframes_per_frame ((uint32_t) rint (sfpf));
-		}
-		
-	} else  {
-		error << string_compose (_("programming error: %1"), "Editor::subframes_per_frame_chosen could not find action to match value.") << endmsg;
-	}
-}
-
-void
-Editor::toggle_region_fades ()
-{
-	ActionManager::toggle_config_state_foo ("Editor", "toggle-region-fades", mem_fun (session->config, &SessionConfiguration::set_use_region_fades), mem_fun (session->config, &SessionConfiguration::get_use_region_fades));
-}
-
-void
-Editor::toggle_region_fades_visible ()
-{
-	ActionManager::toggle_config_state_foo ("Editor", "toggle-region-fades-visible", mem_fun (session->config, &SessionConfiguration::set_show_region_fades), mem_fun (session->config, &SessionConfiguration::get_show_region_fades));
-}
-
-void
-Editor::toggle_auto_xfade ()
-{
-	ActionManager::toggle_config_state_foo ("Editor", "toggle-auto-xfades", mem_fun (session->config, &SessionConfiguration::set_auto_xfade), mem_fun (session->config, &SessionConfiguration::get_auto_xfade));
-}
-
-void
-Editor::toggle_xfades_active ()
-{
-	ActionManager::toggle_config_state_foo ("Editor", "toggle-xfades-active", mem_fun (session->config, &SessionConfiguration::set_xfades_active), mem_fun (session->config, &SessionConfiguration::get_xfades_active));
-}
-
-void
-Editor::toggle_xfade_visibility ()
-{
-	ActionManager::toggle_config_state_foo ("Editor", "toggle-xfades-visible", mem_fun (session->config, &SessionConfiguration::set_xfades_visible), mem_fun (session->config, &SessionConfiguration::get_xfades_visible));
-}
-
-void
-Editor::toggle_link_region_and_track_selection ()
-{
-	ActionManager::toggle_config_state ("Editor", "link-region-and-track-selection", &RCConfiguration::set_link_region_and_track_selection, &RCConfiguration::get_link_region_and_track_selection);
-}
-
-void
-Editor::toggle_automation_follows_regions ()
-{
-	ActionManager::toggle_config_state ("Editor", "automation-follows-regions", &RCConfiguration::set_automation_follows_regions, &RCConfiguration::get_automation_follows_regions);
-}
-
 /** A Configuration parameter has changed.
  * @param parameter_name Name of the changed parameter.
  */
@@ -1784,38 +1295,18 @@ Editor::parameter_changed (std::string p)
 		update_punch_range_view (true);
 	} else if (p == "punch-out") {
 		update_punch_range_view (true);
-	} else if (p == "layer-model") {
-		update_layering_model ();
 	} else if (p == "smpte-format") {
-	        update_smpte_mode ();
 		update_just_smpte ();
-	} else if (p == "video-pullup") {
-		update_video_pullup ();
-	} else if (p == "xfades-active") {
-		ActionManager::map_some_state ("Editor", "toggle-xfades-active", mem_fun (session->config, &SessionConfiguration::get_xfades_active));
 	} else if (p == "xfades-visible") {
-		ActionManager::map_some_state ("Editor", "toggle-xfades-visible", mem_fun (session->config, &SessionConfiguration::get_xfades_visible));
 		update_xfade_visibility ();
 	} else if (p == "show-region-fades") {
-		ActionManager::map_some_state ("Editor", "toggle-region-fades-visible", mem_fun (session->config, &SessionConfiguration::get_show_region_fades));
 		update_region_fade_visibility ();
-	} else if (p == "use-region-fades") {
-		ActionManager::map_some_state ("Editor", "toggle-region-fades", mem_fun (session->config, &SessionConfiguration::get_use_region_fades));
-	} else if (p == "auto-xfade") {
-		ActionManager::map_some_state ("Editor", "toggle-auto-xfades", mem_fun (session->config, &SessionConfiguration::get_auto_xfade));
-	} else if (p == "xfade-model") {
-		update_crossfade_model ();
 	} else if (p == "edit-mode") {
 		edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode()));
 	} else if (p == "subframes-per-frame") {
-		update_subframes_per_frame ();
 		update_just_smpte ();
 	} else if (p == "show-track-meters") {
 		toggle_meter_updating();
-	} else if (p == "link-region-and-track-selection") {
-		ActionManager::map_some_state ("Editor", "link-region-and-track-selection", &RCConfiguration::get_link_region_and_track_selection);
-	} else if (p == "automation-follows-regions") {
-		ActionManager::map_some_state ("Editor", "automation-follows-regions", &RCConfiguration::get_automation_follows_regions);
 	}
 }