From 86dda29be798073d3d8b08aa833b52773b41daad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 16 May 2009 01:53:43 +0000 Subject: Move some sync-related options to being session variables. git-svn-id: svn://localhost/ardour2/branches/3.0@5083 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui_options.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/ardour_ui_options.cc') diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 2216038558..882a1f2b87 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -46,7 +46,7 @@ using namespace sigc; void ARDOUR_UI::toggle_time_master () { - ActionManager::toggle_config_state ("Transport", "ToggleTimeMaster", &RCConfiguration::set_jack_time_master, &RCConfiguration::get_jack_time_master); + ActionManager::toggle_config_state_foo ("Transport", "ToggleTimeMaster", mem_fun (session->config, &SessionConfiguration::set_jack_time_master), mem_fun (session->config, &SessionConfiguration::get_jack_time_master)); } void @@ -461,7 +461,7 @@ ARDOUR_UI::toggle_video_sync() Glib::RefPtr act = ActionManager::get_action ("Transport", "ToggleVideoSync"); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - Config->set_use_video_sync (tact->get_active()); + session->config.set_use_video_sync (tact->get_active()); } } @@ -1153,7 +1153,7 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "clicking") { ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking); } else if (p == "jack-time-master") { - ActionManager::map_some_state ("Transport", "ToggleTimeMaster", &RCConfiguration::get_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") { @@ -1181,7 +1181,7 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "remote-model") { map_remote_model (); } else if (p == "use-video-sync") { - ActionManager::map_some_state ("Transport", "ToggleVideoSync", &RCConfiguration::get_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") { -- cgit v1.2.3