Fix crash when going from >2 outputs (2D panner) to <= 2 outputs.
[ardour.git] / gtk2_ardour / ardour_ui_options.cc
index f7e1faa80652f9a21d285317add53a6a9c774085..acd49fb2a9ada61512cbdfce11e192cd84f4ab36 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2005 Paul Davis 
+    Copyright (C) 2005 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <pbd/convert.h>
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
+#include "pbd/convert.h"
+#include "pbd/stacktrace.h"
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
+#include "ardour/configuration.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+
+#ifdef HAVE_LIBLO
+#include "ardour/osc.h"
+#endif
 
 #include "ardour_ui.h"
 #include "actions.h"
 #include "gui_thread.h"
+#include "public_editor.h"
 
 #include "i18n.h"
 
@@ -36,457 +45,332 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 
 void
-ARDOUR_UI::toggle_config_state (const char* group, const char* action, bool (Configuration::*set)(bool), bool (Configuration::*get)(void) const)
+ARDOUR_UI::toggle_external_sync()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (group, action);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-               if (tact) {
-                       bool x = (Config->*get)();
-
-                       cerr << "\ttoggle config, action = " << tact->get_active() << " config = " << x << endl;
-                       
-                       if (x != tact->get_active()) {
-                               (Config->*set) (!x);
-                       }
-               }
-       }
-}
-
-void
-ARDOUR_UI::toggle_config_state (const char* group, const char* action, sigc::slot<void> theSlot)
-{
-       if (session) {
-               Glib::RefPtr<Action> act = ActionManager::get_action (group, action);
-               if (act) {
-                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-                       if (tact->get_active()) {
-                               theSlot ();
-                       }
-               }
-       }
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
 }
 
 void
 ARDOUR_UI::toggle_time_master ()
 {
-       toggle_config_state ("Transport", "ToggleTimeMaster", &Configuration::set_jack_time_master, &Configuration::get_jack_time_master);
-       if (session) {
-               session->engine().reset_timebase ();
-       }
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleTimeMaster", sigc::mem_fun (_session->config, &SessionConfiguration::set_jack_time_master), sigc::mem_fun (_session->config, &SessionConfiguration::get_jack_time_master));
 }
 
 void
 ARDOUR_UI::toggle_send_mtc ()
 {
-       toggle_config_state ("options", "SendMTC", &Configuration::set_send_mtc, &Configuration::get_send_mtc);
+       ActionManager::toggle_config_state ("options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc);
 }
 
 void
 ARDOUR_UI::toggle_send_mmc ()
 {
-       toggle_config_state ("options", "SendMMC", &Configuration::set_send_mmc, &Configuration::get_send_mmc);
+       ActionManager::toggle_config_state ("options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc);
 }
 
 void
-ARDOUR_UI::toggle_use_mmc ()
+ARDOUR_UI::toggle_send_midi_clock ()
 {
-       toggle_config_state ("options", "UseMMC", &Configuration::set_mmc_control, &Configuration::get_mmc_control);
+       ActionManager::toggle_config_state ("options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock);
 }
 
 void
-ARDOUR_UI::toggle_use_midi_control ()
+ARDOUR_UI::toggle_use_mmc ()
 {
-       toggle_config_state ("options", "UseMIDIcontrol", &Configuration::set_midi_control, &Configuration::get_midi_control);
+       ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
 }
 
 void
 ARDOUR_UI::toggle_send_midi_feedback ()
 {
-       toggle_config_state ("options", "SendMIDIfeedback", &Configuration::set_midi_feedback, &Configuration::get_midi_feedback);
-}
-
-void
-ARDOUR_UI::toggle_AutoConnectNewTrackInputsToHardware()
-{
-       toggle_config_state ("options", "AutoConnectNewTrackInputsToHardware", hide_return (bind (mem_fun (*Config, &Configuration::set_input_auto_connect), AutoConnectPhysical)));
-}
-void
-ARDOUR_UI::toggle_AutoConnectNewTrackOutputsToHardware()
-{
-       toggle_config_state ("options", "AutoConnectNewTrackOutputsToHardware", hide_return (bind (mem_fun (*Config, &Configuration::set_output_auto_connect), AutoConnectPhysical)));
-}
-void
-ARDOUR_UI::toggle_AutoConnectNewTrackOutputsToMaster()
-{
-       toggle_config_state ("options", "AutoConnectNewTrackOutputsToHardware", hide_return (bind (mem_fun (*Config, &Configuration::set_output_auto_connect), AutoConnectMaster)));
-}
-void
-ARDOUR_UI::toggle_ManuallyConnectNewTrackOutputs()
-{
-       toggle_config_state ("options", "AutoConnectNewTrackOutputsToHardware", hide_return (bind (mem_fun (*Config, &Configuration::set_output_auto_connect), AutoConnectOption (0))));
+       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback);
 }
 
 void
 ARDOUR_UI::toggle_auto_input ()
 {
-       toggle_config_state ("Transport", "ToggleAutoInput", &Configuration::set_auto_input, &Configuration::get_auto_input);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::set_auto_input), sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input));
 }
 
 void
 ARDOUR_UI::toggle_auto_play ()
 {
-       toggle_config_state ("Transport", "ToggleAutoPlay", &Configuration::set_auto_play, &Configuration::get_auto_play);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::set_auto_play), sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play));
 }
 
 void
 ARDOUR_UI::toggle_auto_return ()
 {
-       toggle_config_state ("Transport", "ToggleAutoReturn", &Configuration::set_auto_return, &Configuration::get_auto_return);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoReturn", sigc::mem_fun (_session->config, &SessionConfiguration::set_auto_return), sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_return));
 }
 
 void
 ARDOUR_UI::toggle_click ()
 {
-       toggle_config_state ("Transport", "ToggleClick", &Configuration::set_clicking, &Configuration::get_clicking);
+       ActionManager::toggle_config_state ("Transport", "ToggleClick", &RCConfiguration::set_clicking, &RCConfiguration::get_clicking);
 }
 
 void
-ARDOUR_UI::toggle_session_auto_loop ()
+ARDOUR_UI::unset_dual_punch ()
 {
-       if (session) {
-               if (Config->get_auto_loop()) {
-                       if (session->transport_rolling()) {
-                               transport_roll();
-                       } else {
-                               session->request_play_loop (false);
-                       }
-               } else {
-                       session->request_play_loop (true);
+       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
+
+       if (action) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
+               if (tact) {
+                       ignore_dual_punch = true;
+                       tact->set_active (false);
+                       ignore_dual_punch = false;
                }
        }
 }
 
 void
-ARDOUR_UI::toggle_punch_in ()
+ARDOUR_UI::toggle_punch ()
 {
-       toggle_config_state ("Transport", "TogglePunchIn", &Configuration::set_punch_in, &Configuration::get_punch_in);
-}
+       if (ignore_dual_punch) {
+               return;
+       }
 
-void
-ARDOUR_UI::toggle_punch_out ()
-{
-       toggle_config_state ("Transport", "TogglePunchOut", &Configuration::set_punch_out, &Configuration::get_punch_out);
-}
+       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
 
-void
-ARDOUR_UI::toggle_video_sync()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", "ToggleVideoSync");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               Config->set_use_video_sync (tact->get_active());
-       }
-}
+       if (action) {
 
-void
-ARDOUR_UI::toggle_editing_space()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalEditor");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               if (tact->get_active()) {
-                       maximise_editing_space ();
-               } else {
-                       restore_editing_space ();
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
+
+               if (!tact) {
+                       return;
                }
-       }
-}
 
-void
-ARDOUR_UI::toggle_UseHardwareMonitoring()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", "UseHardwareMonitoring");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               if (tact->get_active()) {
-                       Config->set_use_hardware_monitoring (true);
-                       Config->set_use_sw_monitoring (false);
-                       Config->set_use_external_monitoring (false);
-                       if (session) {
-                               session->reset_input_monitor_state();
-                       }
+               /* drive the other two actions from this one */
+
+               Glib::RefPtr<Action> in_action = ActionManager::get_action ("Transport", "TogglePunchIn");
+               Glib::RefPtr<Action> out_action = ActionManager::get_action ("Transport", "TogglePunchOut");
+
+               if (in_action && out_action) {
+                       Glib::RefPtr<ToggleAction> tiact = Glib::RefPtr<ToggleAction>::cast_dynamic(in_action);
+                       Glib::RefPtr<ToggleAction> toact = Glib::RefPtr<ToggleAction>::cast_dynamic(out_action);
+                       tiact->set_active (tact->get_active());
+                       toact->set_active (tact->get_active());
                }
        }
 }
 
 void
-ARDOUR_UI::toggle_UseSoftwareMonitoring()
+ARDOUR_UI::toggle_punch_in ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", "UseSoftwareMonitoring");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               if (tact->get_active()) {
-                       Config->set_use_hardware_monitoring (false);
-                       Config->set_use_sw_monitoring (true);
-                       Config->set_use_external_monitoring (false);
-                       if (session) {
-                               session->reset_input_monitor_state();
-                       }
-               }
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchIn"));
+       if (!act) {
+               return;
        }
-}
 
-void
-ARDOUR_UI::toggle_UseExternalMonitoring()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", "UseExternalMonitoring");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               if (tact->get_active()) {
-                       Config->set_use_hardware_monitoring (false);
-                       Config->set_use_sw_monitoring (false);
-                       Config->set_use_external_monitoring (true);
-                       if (session) {
-                               session->reset_input_monitor_state();
-                       }
-               }
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
        }
-}
 
-void
-ARDOUR_UI::toggle_StopPluginsWithTransport()
-{
-       toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport, &Configuration::get_plugins_stop_with_transport);
-}
+       if (tact->get_active() != _session->config.get_punch_in()) {
+               _session->config.set_punch_in (tact->get_active ());
+       }
 
-void
-ARDOUR_UI::toggle_LatchedRecordEnable()
-{
-       toggle_config_state ("options", "LatchedRecordEnable", &Configuration::set_latched_record_enable, &Configuration::get_latched_record_enable);
+       if (tact->get_active()) {
+               /* if punch-in is turned on, make sure the loop/punch ruler is visible, and stop it being hidden,
+                  to avoid confusing the user */
+               show_loop_punch_ruler_and_disallow_hide ();
+       }
+
+       reenable_hide_loop_punch_ruler_if_appropriate ();
 }
 
 void
-ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording()
+ARDOUR_UI::toggle_punch_out ()
 {
-       toggle_config_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::set_do_not_record_plugins, &Configuration::get_do_not_record_plugins);
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchOut"));
+       if (!act) {
+               return;
+       }
+
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
+
+       if (tact->get_active() != _session->config.get_punch_out()) {
+               _session->config.set_punch_out (tact->get_active ());
+       }
+
+       if (tact->get_active()) {
+               /* if punch-out is turned on, make sure the loop/punch ruler is visible, and stop it being hidden,
+                  to avoid confusing the user */
+               show_loop_punch_ruler_and_disallow_hide ();
+       }
+
+       reenable_hide_loop_punch_ruler_if_appropriate ();
 }
 
 void
-ARDOUR_UI::toggle_VerifyRemoveLastCapture()
+ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide ()
 {
-       toggle_config_state ("options", "VerifyRemoveLastCapture", &Configuration::set_verify_remove_last_capture, &Configuration::get_verify_remove_last_capture);
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");
+       if (!act) {
+               return;
+       }
+
+       act->set_sensitive (false);
+       
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
+       
+       if (!tact->get_active()) {
+               tact->set_active ();
+       }
 }
 
+/* This is a bit of a silly name for a method */
 void
-ARDOUR_UI::toggle_StopRecordingOnXrun()
+ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
 {
-       toggle_config_state ("options", "StopRecordingOnXrun", &Configuration::set_stop_recording_on_xrun, &Configuration::get_stop_recording_on_xrun);
+       if (!_session->config.get_punch_in() && !_session->config.get_punch_out()) {
+               /* if punch in/out are now both off, reallow hiding of the loop/punch ruler */
+               Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");
+               if (act) {
+                       act->set_sensitive (true);
+               }
+       }
 }
 
 void
-ARDOUR_UI::toggle_StopTransportAtEndOfSession()
+ARDOUR_UI::toggle_video_sync()
 {
-       toggle_config_state ("options", "StopTransportAtEndOfSession", &Configuration::set_stop_at_session_end, &Configuration::get_stop_at_session_end);
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", "ToggleVideoSync");
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               _session->config.set_use_video_sync (tact->get_active());
+       }
 }
 
 void
-ARDOUR_UI::toggle_GainReduceFastTransport()
+ARDOUR_UI::toggle_editing_space()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", "GainReduceFastTransport");
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalEditor");
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
                if (tact->get_active()) {
-                       Config->set_quieten_at_speed (0.251189); // -12dB reduction for ffwd or rewind
+                       maximise_editing_space ();
                } else {
-                       Config->set_quieten_at_speed (1.0); /* no change */
+                       restore_editing_space ();
                }
        }
 }
 
 void
-ARDOUR_UI::toggle_LatchedSolo()
+ARDOUR_UI::setup_session_options ()
 {
-       toggle_config_state ("options", "LatchedSolo", &Configuration::set_solo_latched, &Configuration::get_solo_latched);
+       _session->config.ParameterChanged.connect (_session_connections, ui_bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
+       boost::function<void (std::string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
+       _session->config.map_parameters (pc);
 }
 
+#if 0
 void
-ARDOUR_UI::toggle_SoloViaBus()
+ARDOUR_UI::handle_sync_change ()
 {
-       if (!session) {
+       if (!_session) {
                return;
        }
-
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", "SoloViaBus");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-
-               if (tact->get_active()) {
-                       Config->set_solo_model (SoloBus);
-               } else {
-                       Config->set_solo_model (InverseMute);
-               }
+       if (!_session->config.get_external_sync()) {
+               sync_button.set_label (_("Internal"));
+               ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
+               ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
+       } else {
+               sync_button.set_label (_("External"));
+               /* XXX need to make auto-play is off as well as insensitive */
+               ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
+               ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
        }
-}
 
-void
-ARDOUR_UI::toggle_AutomaticallyCreateCrossfades()
-{
 }
+#endif
 
 void
-ARDOUR_UI::toggle_UnmuteNewFullCrossfades()
+ARDOUR_UI::parameter_changed (std::string p)
 {
-}
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::parameter_changed, p)
 
-void
-ARDOUR_UI::mtc_port_changed ()
-{
-       bool have_mtc;
+       if (p == "external-sync") {
 
-       if (session) {
-               if (session->mtc_port()) {
-                       have_mtc = true;
+               ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
+
+               if (!_session->config.get_external_sync()) {
+                       sync_button.set_label (_("Internal"));
+                       ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
+                       ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
                } else {
-                       have_mtc = false;
+                       sync_button.set_label (sync_source_to_string (_session->config.get_sync_source()));
+                       /* XXX need to make auto-play is off as well as insensitive */
+                       ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
+                       ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
                }
-       } else {
-               have_mtc = false;
-       }
-
-       positional_sync_strings.clear ();
-       positional_sync_strings.push_back (slave_source_to_string (None));
-       if (have_mtc) {
-               positional_sync_strings.push_back (slave_source_to_string (MTC));
-       }
-       positional_sync_strings.push_back (slave_source_to_string (JACK));
        
-       set_popdown_strings (sync_option_combo, positional_sync_strings);
-}
+       } else if (p == "send-mtc") {
 
-void
-ARDOUR_UI::setup_session_options ()
-{
-       mtc_port_changed ();
+               ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc);
 
-       Config->ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed));
-}
+       } else if (p == "send-mmc") {
 
-void
-ARDOUR_UI::map_some_state (const char* group, const char* action, bool (Configuration::*get)() const)
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action (group, action);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc);
 
-               if (tact) {
-                       
-                       bool x = (Config->*get)();
+       } else if (p == "use-osc") {
 
-                       cerr << "\tmap state, action = " << tact->get_active() << " config = " << x << endl;
-                       
-                       if (tact->get_active() != x) {
-                               tact->set_active (x);
-                       }
+#ifdef HAVE_LIBLO
+               if (Config->get_use_osc()) {
+                       osc->start ();
                } else {
-                       cerr << "not a toggle\n";
+                       osc->stop ();
                }
-       } else {
-               cerr << group << ':' << action << " not an action\n";
-       }
-}
-
-void
-ARDOUR_UI::parameter_changed (const char* parameter_name)
-{
-       cerr << "Parameter changed : " << parameter_name << endl;
-
-#define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
-       if (PARAM_IS ("slave-source")) {
-
-               sync_option_combo.set_active_text (slave_source_to_string (Config->get_slave_source()));
-
-       } else if (PARAM_IS ("send-mtc")) {
-
-               map_some_state ("options", "SendMTC", &Configuration::get_send_mtc);
-
-       } else if (PARAM_IS ("send-mmc")) {
-
-               map_some_state ("options", "SendMMC", &Configuration::get_send_mmc);
-
-       } else if (PARAM_IS ("mmc-control")) {
-               map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
-       } else if (PARAM_IS ("midi-feedback")) {
-               map_some_state ("options", "SendMIDIfeedback", &Configuration::get_midi_feedback);
-       } else if (PARAM_IS ("midi-control")) {
-               map_some_state ("options", "UseMIDIcontrol", &Configuration::get_midi_control);
-       } else if (PARAM_IS ("do-not-record-plugins")) {
-               map_some_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::get_do_not_record_plugins);
-       } else if (PARAM_IS ("automatic-crossfades")) {
-               map_some_state ("Editor", "toggle-auto-xfades", &Configuration::get_automatic_crossfades);
-       } else if (PARAM_IS ("crossfades-active")) {
-               map_some_state ("Editor", "toggle-xfades-active", &Configuration::get_crossfades_active);
-       } else if (PARAM_IS ("crossfades-visible")) {
-               map_some_state ("Editor", "toggle-xfades-visible", &Configuration::get_crossfades_visible);
-       } else if (PARAM_IS ("latched-record-enable")) {
-               map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
-       } else if (PARAM_IS ("solo-latched")) {
-               map_some_state ("options", "LatchedSolo", &Configuration::get_solo_latched);
-       } else if (PARAM_IS ("solo-model")) {
-       } else if (PARAM_IS ("layer-model")) {
-       } else if (PARAM_IS ("crossfade-model")) {
-       } else if (PARAM_IS ("auto-play")) {
-               map_some_state ("Transport", "ToggleAutoPlay", &Configuration::get_auto_play);
-       } else if (PARAM_IS ("auto-loop")) {
-               map_some_state ("Transport", "Loop", &Configuration::get_auto_loop);
-       } else if (PARAM_IS ("auto-return")) {
-               map_some_state ("Transport", "ToggleAutoReturn", &Configuration::get_auto_return);
-       } else if (PARAM_IS ("auto-input")) {
-               map_some_state ("Transport", "ToggleAutoInput", &Configuration::get_auto_input);
-       } else if (PARAM_IS ("punch-out")) {
-               map_some_state ("Transport", "TogglePunchOut", &Configuration::get_punch_out);
-       } else if (PARAM_IS ("punch-in")) {
-               map_some_state ("Transport", "TogglePunchIn", &Configuration::get_punch_in);
-       } else if (PARAM_IS ("clicking")) {
-               map_some_state ("Transport", "ToggleClick", &Configuration::get_clicking);
-       } else if (PARAM_IS ("jack-time-master")) {
-               map_some_state ("Transport",  "ToggleTimeMaster", &Configuration::get_jack_time_master);
-       } else if (PARAM_IS ("plugins-stop-with-transport")) {
-               map_some_state ("options",  "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport);
-       } else if (PARAM_IS ("latched-record-enable")) {
-               map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
-       } else if (PARAM_IS ("verify-remove-last-capture")) {
-               map_some_state ("options",  "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture);
-       } else if (PARAM_IS ("stop-recording-on-xrun")) {
-               map_some_state ("options",  "StopRecordingOnXrun", &Configuration::get_stop_recording_on_xrun);
-       } else if (PARAM_IS ("stop-at-session-end")) {
-               map_some_state ("options",  "StopTransportAtEndOfSession", &Configuration::get_stop_at_session_end);
-       } else if (PARAM_IS ("use-hardware-monitoring")) {
-               map_some_state ("options",  "UseHardwareMonitoring", &Configuration::get_use_hardware_monitoring);
-       } else if (PARAM_IS ("use-sw-monitoring")) {
-               map_some_state ("options",  "UseSoftwareMonitoring", &Configuration::get_use_sw_monitoring);
-       } else if (PARAM_IS ("use-external-monitoring")) {
-               map_some_state ("options",  "UseExternalMonitoring", &Configuration::get_use_external_monitoring);
-       } else if (PARAM_IS ("use-video-sync")) {
-               map_some_state ("Transport",  "ToggleVideoSync", &Configuration::get_use_video_sync);
-       } else if (PARAM_IS ("quieten-at-speed")) {
-               map_some_state ("options",  "GainReduceFastTransport", &Configuration::get_quieten_at_speed);
-       } else if (PARAM_IS ("shuttle-behaviour")) {
+#endif
+
+       } else if (p == "mmc-control") {
+               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 == "auto-play") {
+               ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play));
+       } else if (p == "auto-return") {
+               ActionManager::map_some_state ("Transport", "ToggleAutoReturn", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_return));
+       } else if (p == "auto-input") {
+               ActionManager::map_some_state ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input));
+       } else if (p == "punch-out") {
+               ActionManager::map_some_state ("Transport", "TogglePunchOut", sigc::mem_fun (_session->config, &SessionConfiguration::get_punch_out));
+               if (!_session->config.get_punch_out()) {
+                       unset_dual_punch ();
+               }
+       } else if (p == "punch-in") {
+               ActionManager::map_some_state ("Transport", "TogglePunchIn", sigc::mem_fun (_session->config, &SessionConfiguration::get_punch_in));
+               if (!_session->config.get_punch_in()) {
+                       unset_dual_punch ();
+               }
+       } 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", sigc::mem_fun (_session->config, &SessionConfiguration::get_jack_time_master));
+       } else if (p == "use-video-sync") {
+               ActionManager::map_some_state ("Transport",  "ToggleVideoSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_use_video_sync));
+       } else if (p == "shuttle-behaviour") {
 
                switch (Config->get_shuttle_behaviour ()) {
                case Sprung:
                        shuttle_style_button.set_active_text (_("sprung"));
                        shuttle_fract = 0.0;
                        shuttle_box.queue_draw ();
-                       if (session) {
-                               if (session->transport_rolling()) {
+                       if (_session) {
+                               if (_session->transport_rolling()) {
                                        shuttle_fract = SHUTTLE_FRACT_SPEED1;
-                                       session->request_transport_speed (1.0);
+                                       _session->request_transport_speed (1.0);
                                }
                        }
                        break;
@@ -495,8 +379,8 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                        break;
                }
 
-       } else if (PARAM_IS ("shuttle-units")) {
-               
+       } else if (p == "shuttle-units") {
+
                switch (Config->get_shuttle_units()) {
                case Percentage:
                        shuttle_units_button.set_label("% ");
@@ -505,7 +389,23 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                        shuttle_units_button.set_label(_("ST"));
                        break;
                }
+       } else if (p == "video-pullup" || p == "timecode-format") {
+               reset_main_clocks ();
+       } else if (p == "show-track-meters") {
+               editor->toggle_meter_updating();
+       }
+}
+
+void
+ARDOUR_UI::reset_main_clocks ()
+{
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::reset_main_clocks)
+
+       if (_session) {
+               primary_clock.set (_session->audible_frame(), true);
+               secondary_clock.set (_session->audible_frame(), true);
+       } else {
+               primary_clock.set (0, true);
+               secondary_clock.set (0, true);
        }
-       
-#undef PARAM_IS
 }