remove AU GUI debugging test in which arrow keys could be used to change GUI size
[ardour.git] / gtk2_ardour / ardour_ui_options.cc
index d013f98e5b142cda00d09186fa2fc1eaef25ed8e..f2f7d397df257af797c3d1fcf46df764a1367823 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
 
 */
 
-#include <pbd/convert.h>
-#include <pbd/stacktrace.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/osc.h>
-#include <ardour/audioengine.h>
+#include "ardour/rc_configuration.h"
+#include "ardour/session.h"
+
+#ifdef HAVE_LIBLO
+#include "ardour/osc.h"
+#endif
 
+#include "audio_clock.h"
 #include "ardour_ui.h"
 #include "actions.h"
 #include "gui_thread.h"
+#include "public_editor.h"
+#include "main_clock.h"
 
 #include "i18n.h"
 
@@ -37,375 +46,231 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
+
+void
+ARDOUR_UI::toggle_keep_tearoffs ()
+{
+       ActionManager::toggle_config_state ("Common", "KeepTearoffs", &RCConfiguration::set_keep_tearoffs, &RCConfiguration::get_keep_tearoffs);
+
+       ARDOUR_UI::toggle_editing_space ();
+}
+
+void
+ARDOUR_UI::toggle_external_sync()
+{
+       if (_session) {
+               if (_session->config.get_video_pullup() != 0.0f) {
+                       if (_session->config.get_sync_source() == JACK) {
+                               MessageDialog msg (
+                                       _("It is not possible to use JACK as the the sync source\n\
+when the pull up/down setting is non-zero."));
+                               msg.run ();
+                               return;
+                       }
+               }
+
+               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 ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleTimeMaster", &Configuration::set_jack_time_master, &Configuration::get_jack_time_master);
+       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 ()
 {
-       ActionManager::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 ()
 {
-       ActionManager::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 ()
 {
-       ActionManager::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_osc ()
+ARDOUR_UI::toggle_use_mmc ()
 {
-       ActionManager::toggle_config_state ("options", "UseOSC", &Configuration::set_use_osc, &Configuration::get_use_osc);
+       ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
 }
 
 void
 ARDOUR_UI::toggle_send_midi_feedback ()
 {
-       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &Configuration::set_midi_feedback, &Configuration::get_midi_feedback);
+       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback);
 }
 
 void
-ARDOUR_UI::toggle_denormal_protection ()
+ARDOUR_UI::toggle_auto_input ()
 {
-       ActionManager::toggle_config_state ("options", "DenormalProtection", &Configuration::set_denormal_protection, &Configuration::get_denormal_protection);
+       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_only_copy_imported_files ()
+ARDOUR_UI::toggle_auto_play ()
 {
-       ActionManager::toggle_config_state ("options", "OnlyCopyImportedFiles", &Configuration::set_only_copy_imported_files, &Configuration::get_only_copy_imported_files);
+       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::set_native_file_header_format (HeaderFormat hf)
+ARDOUR_UI::toggle_auto_return ()
 {
-       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() && Config->get_native_file_header_format() != hf) {
-                       Config->set_native_file_header_format (hf);
-               }
-       }
+       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::set_native_file_data_format (SampleFormat sf)
+ARDOUR_UI::toggle_click ()
 {
-       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() && Config->get_native_file_data_format() != sf) {
-                       Config->set_native_file_data_format (sf);
-               }
-       }
+       ActionManager::toggle_config_state ("Transport", "ToggleClick", &RCConfiguration::set_clicking, &RCConfiguration::get_clicking);
 }
 
 void
-ARDOUR_UI::set_input_auto_connect (AutoConnectOption option)
+ARDOUR_UI::unset_dual_punch ()
 {
-       const char* action;
-       
-       switch (option) {
-       case AutoConnectPhysical:
-               action = X_("InputAutoConnectPhysical");
-               break;
-       default:
-               action = X_("InputAutoConnectManual");
-       }
-
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
+       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
 
-       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);
+       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::set_output_auto_connect (AutoConnectOption option)
+ARDOUR_UI::toggle_punch ()
 {
-       const char* action;
-       
-       switch (option) {
-       case AutoConnectPhysical:
-               action = X_("OutputAutoConnectPhysical");
-               break;
-       case AutoConnectMaster:
-               action = X_("OutputAutoConnectMaster");
-               break;
-       default:
-               action = X_("OutputAutoConnectManual");
+       if (ignore_dual_punch) {
+               return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
+       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
 
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
+       if (action) {
 
-               if (ract && ract->get_active() && Config->get_output_auto_connect() != option) {
-                       Config->set_output_auto_connect (option);
-               }
-       }
-}
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
 
-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*/
-       }
+               if (!tact) {
+                       return;
+               }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
+               /* drive the other two actions from this one */
 
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
+               Glib::RefPtr<Action> in_action = ActionManager::get_action ("Transport", "TogglePunchIn");
+               Glib::RefPtr<Action> out_action = ActionManager::get_action ("Transport", "TogglePunchOut");
 
-               if (ract && ract->get_active() && Config->get_solo_model() != model) {
-                       Config->set_solo_model (model);
+               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::set_remote_model (RemoteModel model)
+ARDOUR_UI::toggle_punch_in ()
 {
-       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 (X_("Transport"), X_("TogglePunchIn"));
+       if (!act) {
+               return;
        }
 
-       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);
-               }
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
        }
 
-}
-
-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*/
+       if (tact->get_active() != _session->config.get_punch_in()) {
+               _session->config.set_punch_in (tact->get_active ());
        }
 
-       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);
-               }
+       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::set_denormal_model (DenormalModel model)
+ARDOUR_UI::toggle_punch_out ()
 {
-       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 (X_("Transport"), X_("TogglePunchOut"));
+       if (!act) {
+               return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
 
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
+       if (tact->get_active() != _session->config.get_punch_out()) {
+               _session->config.set_punch_out (tact->get_active ());
+       }
 
-               if (ract && ract->get_active() && Config->get_denormal_model() != model) {
-                       Config->set_denormal_model (model);
-               }
+       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_auto_input ()
+ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleAutoInput", &Configuration::set_auto_input, &Configuration::get_auto_input);
-}
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");
+       if (!act) {
+               return;
+       }
 
-void
-ARDOUR_UI::toggle_auto_play ()
-{
-       ActionManager::toggle_config_state ("Transport", "ToggleAutoPlay", &Configuration::set_auto_play, &Configuration::get_auto_play);
-}
+       act->set_sensitive (false);
 
-void
-ARDOUR_UI::toggle_auto_return ()
-{
-       ActionManager::toggle_config_state ("Transport", "ToggleAutoReturn", &Configuration::set_auto_return, &Configuration::get_auto_return);
-}
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
 
-void
-ARDOUR_UI::toggle_click ()
-{
-       ActionManager::toggle_config_state ("Transport", "ToggleClick", &Configuration::set_clicking, &Configuration::get_clicking);
+       if (!tact->get_active()) {
+               tact->set_active ();
+       }
 }
 
+/* This is a bit of a silly name for a method */
 void
-ARDOUR_UI::toggle_session_auto_loop ()
+ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
 {
-       if (session) {
-               if (session->get_play_loop()) {
-                       if (session->transport_rolling()) {
-                               transport_roll();
-                       } else {
-                               session->request_play_loop (false);
-                       }
-               } else {
-                       session->request_play_loop (true);
+       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_punch_in ()
-{
-       ActionManager::toggle_config_state ("Transport", "TogglePunchIn", &Configuration::set_punch_in, &Configuration::get_punch_in);
-}
-
-void
-ARDOUR_UI::toggle_punch_out ()
-{
-       ActionManager::toggle_config_state ("Transport", "TogglePunchOut", &Configuration::set_punch_out, &Configuration::get_punch_out);
-}
-
 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());
+               _session->config.set_use_video_sync (tact->get_active());
        }
 }
 
@@ -413,6 +278,7 @@ 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()) {
@@ -424,692 +290,173 @@ ARDOUR_UI::toggle_editing_space()
 }
 
 void
-ARDOUR_UI::toggle_StopPluginsWithTransport()
-{
-       ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport, &Configuration::get_plugins_stop_with_transport);
-}
-
-void
-ARDOUR_UI::toggle_LatchedRecordEnable()
-{
-       ActionManager::toggle_config_state ("options", "LatchedRecordEnable", &Configuration::set_latched_record_enable, &Configuration::get_latched_record_enable);
-}
-
-void
-ARDOUR_UI::toggle_RegionEquivalentsOverlap()
-{
-       ActionManager::toggle_config_state ("options", "RegionEquivalentsOverlap", &Configuration::set_use_overlap_equivalency, &Configuration::get_use_overlap_equivalency);
-}
-
-void
-ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording()
-{
-       ActionManager::toggle_config_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::set_do_not_record_plugins, &Configuration::get_do_not_record_plugins);
-}
-
-void
-ARDOUR_UI::toggle_VerifyRemoveLastCapture()
-{
-       ActionManager::toggle_config_state ("options", "VerifyRemoveLastCapture", &Configuration::set_verify_remove_last_capture, &Configuration::get_verify_remove_last_capture);
-}
-
-void
-ARDOUR_UI::toggle_PeriodicSafetyBackups()
-{
-       ActionManager::toggle_config_state ("options", "PeriodicSafetyBackups", &Configuration::set_periodic_safety_backups, &Configuration::get_periodic_safety_backups);
-}
-
-void
-ARDOUR_UI::toggle_StopRecordingOnXrun()
-{
-       ActionManager::toggle_config_state ("options", "StopRecordingOnXrun", &Configuration::set_stop_recording_on_xrun, &Configuration::get_stop_recording_on_xrun);
-}
-
-void
-ARDOUR_UI::toggle_sync_order_keys ()
-{
-       ActionManager::toggle_config_state ("options", "SyncEditorAndMixerTrackOrder", &Configuration::set_sync_all_route_ordering, &Configuration::get_sync_all_route_ordering);
-}
-
-void
-ARDOUR_UI::toggle_StopTransportAtEndOfSession()
-{
-       ActionManager::toggle_config_state ("options", "StopTransportAtEndOfSession", &Configuration::set_stop_at_session_end, &Configuration::get_stop_at_session_end);
-}
-
-void
-ARDOUR_UI::toggle_GainReduceFastTransport()
-{
-       ActionManager::toggle_config_state ("options", "GainReduceFastTransport", &Configuration::set_quieten_at_speed, &Configuration::get_quieten_at_speed);
-}
-
-void
-ARDOUR_UI::toggle_LatchedSolo()
+ARDOUR_UI::setup_session_options ()
 {
-       ActionManager::toggle_config_state ("options", "LatchedSolo", &Configuration::set_solo_latched, &Configuration::get_solo_latched);
+       _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::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);
 }
 
 void
-ARDOUR_UI::toggle_ShowSoloMutes()
+ARDOUR_UI::parameter_changed (std::string p)
 {
-       ActionManager::toggle_config_state ("options", "ShowSoloMutes", &Configuration::set_show_solo_mutes, &Configuration::get_show_solo_mutes);
-}
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::parameter_changed, p)
 
-void
-ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor()
-{
-       ActionManager::toggle_config_state ("options", "PrimaryClockDeltaEditCursor", &Configuration::set_primary_clock_delta_edit_cursor, &Configuration::get_primary_clock_delta_edit_cursor);
-}
+       if (p == "external-sync") {
 
-void
-ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor()
-{
-       ActionManager::toggle_config_state ("options", "SecondaryClockDeltaEditCursor", &Configuration::set_secondary_clock_delta_edit_cursor, &Configuration::get_secondary_clock_delta_edit_cursor);
-}
+               ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
 
-void
-ARDOUR_UI::mtc_port_changed ()
-{
-       bool have_mtc;
-
-       if (session) {
-               if (session->mtc_port()) {
-                       have_mtc = true;
+               if (!_session->config.get_external_sync()) {
+                       sync_button.set_text (_("Internal"));
+                       ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
+                       ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
                } else {
-                       have_mtc = false;
+                       sync_button.set_text (sync_source_to_string (_session->config.get_sync_source(), true));
+                       /* 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);
-}
-
-void
-ARDOUR_UI::setup_session_options ()
-{
-       mtc_port_changed ();
-
-       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");
-       }
+       } else if (p == "always-play-range") {
 
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               ActionManager::map_some_state ("Transport", "AlwaysPlayRange", &RCConfiguration::get_always_play_range);
 
-               if (tact && !tact->get_active()) {
-                       tact->set_active (true);
-               }
-       }
-}
+       } else if (p == "send-mtc") {
 
-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;
-       }
+               ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc);
 
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+       } else if (p == "send-mmc") {
 
-               if (tact && !tact->get_active()) {
-                       tact->set_active (true);
-               }
-       }
-}
+               ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc);
 
-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);
+       } else if (p == "use-osc") {
 
-               if (tact && !tact->get_active()) {
-                       tact->set_active (Config->get_denormal_protection());
+#ifdef HAVE_LIBLO
+               if (Config->get_use_osc()) {
+                       osc->start ();
+               } else {
+                       osc->stop ();
                }
-       }
-}
-
-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);
+#endif
 
-               if (tact && !tact->get_active()) {
-                       tact->set_active (true);
+       } else if (p == "keep-tearoffs") {
+               ActionManager::map_some_state ("Common", "KeepTearoffs", &RCConfiguration::get_keep_tearoffs);
+       } 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 ();
                }
-       }
-}
-
-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);
+       } 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 ();
                }
-       }
-}
-
-void
-ARDOUR_UI::map_file_header_format ()
-{
-       const char* action = 0;
-
-       switch (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"), 
-                                        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);
+       } else if (p == "clicking") {
+               ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking);
+       } 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 == "video-pullup" || p == "timecode-format") {
+
+               synchronize_sync_source_and_video_pullup ();
+               reset_main_clocks ();
+
+       } else if (p == "sync-source") {
+
+               synchronize_sync_source_and_video_pullup ();
+
+       } else if (p == "show-track-meters") {
+               editor->toggle_meter_updating();
+       } else if (p == "primary-clock-delta-edit-cursor") {
+               if (Config->get_primary_clock_delta_edit_cursor()) {
+                       primary_clock->set_is_duration (true);
+                       primary_clock->set_editable (false);
+                       primary_clock->set_widget_name ("transport delta");
+               } else {
+                       primary_clock->set_is_duration (false);
+                       primary_clock->set_editable (true);
+                       primary_clock->set_widget_name ("transport");
                }
-       }
-}
-
-void
-ARDOUR_UI::map_file_data_format ()
-{
-       const char* action = 0;
-
-       switch (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"), 
-                                        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);
+       } else if (p == "secondary-clock-delta-edit-cursor") {
+               if (Config->get_secondary_clock_delta_edit_cursor()) {
+                       secondary_clock->set_is_duration (true);
+                       secondary_clock->set_editable (false);
+                       secondary_clock->set_widget_name ("secondary delta");
+               } else {
+                       secondary_clock->set_is_duration (false);
+                       secondary_clock->set_editable (true);
+                       secondary_clock->set_widget_name ("secondary");
                }
        }
 }
 
 void
-ARDOUR_UI::map_input_auto_connect ()
+ARDOUR_UI::session_parameter_changed (std::string p)
 {
-       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);
-               }
+       if (p == "native-file-data-format" || p == "native-file-header-format") {
+               update_format ();
        }
 }
 
 void
-ARDOUR_UI::map_output_auto_connect ()
+ARDOUR_UI::reset_main_clocks ()
 {
-       const char* on;
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::reset_main_clocks)
 
-       if (Config->get_output_auto_connect() == (AutoConnectOption) 0) {
-               on = "OutputAutoConnectManual";
-       } else if (Config->get_output_auto_connect() == AutoConnectPhysical) {
-               on = "OutputAutoConnectPhysical";
+       if (_session) {
+               primary_clock->set (_session->audible_frame(), true);
+               secondary_clock->set (_session->audible_frame(), true);
        } 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());
-               }
+               primary_clock->set (0, true);
+               secondary_clock->set (0, true);
        }
-
 }
 
-
 void
-ARDOUR_UI::map_meter_falloff ()
+ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
 {
-       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_("Transport"), X_("ToggleExternalSync"));
 
-       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);
-               }
+       if (!act) {
+               return;
        }
-}
 
-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;
+       if (!_session) {
+               goto just_label;
        }
 
-       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);
+       if (_session->config.get_video_pullup() == 0.0f) {
+               /* with no video pull up/down, any sync source is OK */
+               act->set_sensitive (true);
+       } else {
+               /* can't sync to JACK if video pullup != 0.0 */
+               if (_session->config.get_sync_source() == JACK) {
+                       act->set_sensitive (false);
+               } else {
+                       act->set_sensitive (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);
-               }
-       }
-}
+       /* XXX should really be able to set the video pull up
+          action to insensitive/sensitive, but there is no action.
+          FIXME
+       */
 
-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;
+  just_label:
+       if (act->get_sensitive ()) {
+               set_tip (sync_button, _("Enable/Disable external positional sync"));
+       } else {
+               set_tip (sync_button, _("Sync to JACK is not possible: video pull up/down is set"));
        }
 
-       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 (const char* parameter_name)
-{
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &ARDOUR_UI::parameter_changed), parameter_name));
-
-#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()));
-               
-               switch (Config->get_slave_source()) {
-               case None:
-                       ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
-                       ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
-                       break;
-
-               default:
-                       /* 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);
-                       break;
-               }
-
-       } else if (PARAM_IS ("send-mtc")) {
-
-               ActionManager::map_some_state ("options", "SendMTC", &Configuration::get_send_mtc);
-
-       } else if (PARAM_IS ("send-mmc")) {
-
-               ActionManager::map_some_state ("options", "SendMMC", &Configuration::get_send_mmc);
-
-       } else if (PARAM_IS ("use-osc")) {
-
-#ifdef HAVE_LIBLO
-               if (Config->get_use_osc()) {
-                       osc->start ();
-               } else {
-                       osc->stop ();
-               }
-#endif
-
-               ActionManager::map_some_state ("options", "UseOSC", &Configuration::get_use_osc);
-               
-       } else if (PARAM_IS ("mmc-control")) {
-               ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
-       } else if (PARAM_IS ("midi-feedback")) {
-               ActionManager::map_some_state ("options", "SendMIDIfeedback", &Configuration::get_midi_feedback);
-       } else if (PARAM_IS ("do-not-record-plugins")) {
-               ActionManager::map_some_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::get_do_not_record_plugins);
-       } else if (PARAM_IS ("latched-record-enable")) {
-               ActionManager::map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
-       } else if (PARAM_IS ("solo-latched")) {
-               ActionManager::map_some_state ("options", "LatchedSolo", &Configuration::get_solo_latched);
-       } else if (PARAM_IS ("show-solo-mutes")) {
-               ActionManager::map_some_state ("options", "ShowSoloMutes", &Configuration::get_show_solo_mutes);
-       } else if (PARAM_IS ("solo-model")) {
-               map_solo_model ();
-       } else if (PARAM_IS ("auto-play")) {
-               ActionManager::map_some_state ("Transport", "ToggleAutoPlay", &Configuration::get_auto_play);
-       } else if (PARAM_IS ("auto-return")) {
-               ActionManager::map_some_state ("Transport", "ToggleAutoReturn", &Configuration::get_auto_return);
-       } else if (PARAM_IS ("auto-input")) {
-               ActionManager::map_some_state ("Transport", "ToggleAutoInput", &Configuration::get_auto_input);
-       } else if (PARAM_IS ("punch-out")) {
-               ActionManager::map_some_state ("Transport", "TogglePunchOut", &Configuration::get_punch_out);
-       } else if (PARAM_IS ("punch-in")) {
-               ActionManager::map_some_state ("Transport", "TogglePunchIn", &Configuration::get_punch_in);
-       } else if (PARAM_IS ("clicking")) {
-               ActionManager::map_some_state ("Transport", "ToggleClick", &Configuration::get_clicking);
-       } else if (PARAM_IS ("jack-time-master")) {
-               ActionManager::map_some_state ("Transport",  "ToggleTimeMaster", &Configuration::get_jack_time_master);
-       } else if (PARAM_IS ("plugins-stop-with-transport")) {
-               ActionManager::map_some_state ("options",  "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport);
-       } else if (PARAM_IS ("latched-record-enable")) {
-               ActionManager::map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
-       } else if (PARAM_IS ("verify-remove-last-capture")) {
-               ActionManager::map_some_state ("options",  "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture);
-       } else if (PARAM_IS ("periodic-safety-backups")) {
-               ActionManager::map_some_state ("options",  "PeriodicSafetyBackups", &Configuration::get_periodic_safety_backups);
-       } else if (PARAM_IS ("stop-recording-on-xrun")) {
-               ActionManager::map_some_state ("options",  "StopRecordingOnXrun", &Configuration::get_stop_recording_on_xrun);
-       } else if (PARAM_IS ("sync-all-route-ordering")) {
-               ActionManager::map_some_state ("options",  "SyncEditorAndMixerTrackOrder", &Configuration::get_sync_all_route_ordering);
-       } else if (PARAM_IS ("stop-at-session-end")) {
-               ActionManager::map_some_state ("options",  "StopTransportAtEndOfSession", &Configuration::get_stop_at_session_end);
-       } else if (PARAM_IS ("monitoring-model")) {
-               map_monitor_model ();
-       } else if (PARAM_IS ("denormal-model")) {
-               map_denormal_model ();
-       } else if (PARAM_IS ("denormal-protection")) {
-               map_denormal_protection ();
-       } else if (PARAM_IS ("remote-model")) {
-               map_remote_model ();
-       } else if (PARAM_IS ("use-video-sync")) {
-               ActionManager::map_some_state ("Transport",  "ToggleVideoSync", &Configuration::get_use_video_sync);
-       } else if (PARAM_IS ("quieten-at-speed")) {
-               ActionManager::map_some_state ("options",  "GainReduceFastTransport", &Configuration::get_quieten_at_speed);
-       } else if (PARAM_IS ("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()) {
-                                       shuttle_fract = SHUTTLE_FRACT_SPEED1;
-                                       session->request_transport_speed (1.0);
-                               }
-                       }
-                       break;
-               case Wheel:
-                       shuttle_style_button.set_active_text (_("wheel"));
-                       break;
-               }
-
-       } else if (PARAM_IS ("shuttle-units")) {
-               
-               switch (Config->get_shuttle_units()) {
-               case Percentage:
-                       shuttle_units_button.set_label("% ");
-                       break;
-               case Semitones:
-                       shuttle_units_button.set_label(_("ST"));
-                       break;
-               }
-       } else if (PARAM_IS ("input-auto-connect")) {
-               map_input_auto_connect ();
-       } else if (PARAM_IS ("output-auto-connect")) {
-               map_output_auto_connect ();
-       } else if (PARAM_IS ("native-file-header-format")) {
-               map_file_header_format ();
-       } else if (PARAM_IS ("native-file-data-format")) {
-               map_file_data_format ();
-       } else if (PARAM_IS ("meter-hold")) {
-               map_meter_hold ();
-       } else if (PARAM_IS ("meter-falloff")) {
-               map_meter_falloff ();
-       } else if (PARAM_IS ("video-pullup") || PARAM_IS ("smpte-format")) {
-               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);
-               }
-       } else if (PARAM_IS ("use-overlap-equivalency")) {
-               ActionManager::map_some_state ("options", "RegionEquivalentsOverlap", &Configuration::get_use_overlap_equivalency);
-       } else if (PARAM_IS ("primary-clock-delta-edit-cursor")) {
-               ActionManager::map_some_state ("options",  "PrimaryClockDeltaEditCursor", &Configuration::get_primary_clock_delta_edit_cursor);
-       } else if (PARAM_IS ("secondary-clock-delta-edit-cursor")) {
-               ActionManager::map_some_state ("options",  "SecondaryClockDeltaEditCursor", &Configuration::get_secondary_clock_delta_edit_cursor);
-       } else if (PARAM_IS ("only-copy-imported-files")) {
-               map_only_copy_imported_files ();
-       }
-
-#undef PARAM_IS
-}