remove "New Return" menu option from processor box; make return toggle processor...
[ardour.git] / gtk2_ardour / ardour_ui_options.cc
index 2fbec5d9a107b67a901889feaa87564974ec4950..c00097d41712e980fa1067f580017a5358d55e1b 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$
 */
 
+#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"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
+using namespace PBD;
+using namespace sigc;
 
 void
-ARDOUR_UI::toggle_time_master ()
-{
-       toggle_config_state ("Transport", "ToggleTimeMaster", &Configuration::set_jack_time_master);
-       if (session) {
-               session->engine().reset_timebase ();
-       }
-}
-
-void
-ARDOUR_UI::toggle_config_state (const char* group, const char* action, void (Configuration::*set)(bool))
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action (group, action);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               (Config->*set) (tact->get_active());
-       }
-}
-
-void
-ARDOUR_UI::toggle_session_state (const char* group, const char* action, void (Session::*set)(bool), bool (Session::*get)(void) const)
+ARDOUR_UI::toggle_external_sync()
 {
-       if (session) {
-               Glib::RefPtr<Action> act = ActionManager::get_action (group, action);
-               if (act) {
-                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-                       bool x = (session->*get)();
-
-                       if (x != tact->get_active()) {
-                               (session->*set) (!x);
-                       }
-               }
-       }
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", mem_fun (session->config, &SessionConfiguration::set_external_sync), mem_fun (session->config, &SessionConfiguration::get_external_sync));
 }
 
 void
-ARDOUR_UI::toggle_session_state (const char* group, const char* action, sigc::slot<void> theSlot)
+ARDOUR_UI::toggle_time_master ()
 {
-       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", "ToggleTimeMaster", mem_fun (session->config, &SessionConfiguration::set_jack_time_master), mem_fun (session->config, &SessionConfiguration::get_jack_time_master));
 }
 
 void
 ARDOUR_UI::toggle_send_mtc ()
 {
-       toggle_session_state ("options", "SendMTC", &Session::set_send_mtc, &Session::get_send_mtc);
+       ActionManager::toggle_config_state ("options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc);
 }
 
 void
 ARDOUR_UI::toggle_send_mmc ()
 {
-       toggle_session_state ("options", "SendMMC", &Session::set_send_mmc, &Session::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_session_state ("options", "UseMMC", &Session::set_mmc_control, &Session::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_session_state ("options", "UseMIDIcontrol", &Session::set_midi_control, &Session::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_session_state ("options", "SendMIDIfeedback", &Session::set_midi_feedback, &Session::get_midi_feedback);
+       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback);
 }
 
 void
-ARDOUR_UI::toggle_AutoConnectNewTrackInputsToHardware()
+ARDOUR_UI::toggle_auto_input ()
 {
-       toggle_session_state ("options", "AutoConnectNewTrackInputsToHardware", &Session::set_input_auto_connect, &Session::get_input_auto_connect);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::set_auto_input), mem_fun (session->config, &SessionConfiguration::get_auto_input));
 }
+
 void
-ARDOUR_UI::toggle_AutoConnectNewTrackOutputsToHardware()
+ARDOUR_UI::toggle_auto_play ()
 {
-       toggle_session_state ("options", "AutoConnectNewTrackOutputsToHardware", bind (mem_fun (session, &Session::set_output_auto_connect), Session::AutoConnectPhysical));
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoPlay", mem_fun (session->config, &SessionConfiguration::set_auto_play), mem_fun (session->config, &SessionConfiguration::get_auto_play));
 }
+
 void
-ARDOUR_UI::toggle_AutoConnectNewTrackOutputsToMaster()
+ARDOUR_UI::toggle_auto_return ()
 {
-       toggle_session_state ("options", "AutoConnectNewTrackOutputsToHardware", bind (mem_fun (session, &Session::set_output_auto_connect), Session::AutoConnectMaster));
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoReturn", mem_fun (session->config, &SessionConfiguration::set_auto_return), mem_fun (session->config, &SessionConfiguration::get_auto_return));
 }
+
 void
-ARDOUR_UI::toggle_ManuallyConnectNewTrackOutputs()
+ARDOUR_UI::toggle_click ()
 {
-       toggle_session_state ("options", "AutoConnectNewTrackOutputsToHardware", bind (mem_fun (session, &Session::set_output_auto_connect), Session::AutoConnectOption (0)));
+       ActionManager::toggle_config_state ("Transport", "ToggleClick", &RCConfiguration::set_clicking, &RCConfiguration::get_clicking);
 }
 
 void
-ARDOUR_UI::toggle_UseHardwareMonitoring()
+ARDOUR_UI::unset_dual_punch ()
 {
-       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 (true);
-                       Config->set_use_sw_monitoring (false);
-                       if (session) {
-                               session->reset_input_monitor_state();
-                       }
+       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_UseSoftwareMonitoring()
+ARDOUR_UI::toggle_punch ()
 {
-       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);
-                       if (session) {
-                               session->reset_input_monitor_state();
-                       }
-               }
+       if (ignore_dual_punch) {
+               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);
-                       if (session) {
-                               session->reset_input_monitor_state();
-                       }
+       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
+
+       if (action) {
+
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
+
+               if (!tact) {
+                       return;
+               }
+
+               /* 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_StopPluginsWithTransport()
+ARDOUR_UI::toggle_punch_in ()
 {
-       toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport);
-}
-void
-ARDOUR_UI::toggle_RunPluginsWhileRecording()
-{
-       toggle_session_state ("options", "RunPluginsWhileRecording", &Session::set_recording_plugins, &Session::get_recording_plugins);
-}
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchIn"));
+       if (!act) {
+               return;
+       }
 
-void
-ARDOUR_UI::toggle_VerifyRemoveLastCapture()
-{
-       toggle_config_state ("options", "VerifyRemoveLastCapture", &Configuration::set_verify_remove_last_capture);
-}
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
 
-void
-ARDOUR_UI::toggle_StopRecordingOnXrun()
-{
-       toggle_config_state ("options", "StopRecordingOnXrun", &Configuration::set_stop_recording_on_xrun);
-}
+       if (tact->get_active() != session->config.get_punch_in()) {
+               session->config.set_punch_in (tact->get_active ());
+       }
 
-void
-ARDOUR_UI::toggle_StopTransportAtEndOfSession()
-{
-       toggle_config_state ("options", "StopTransportAtEndOfSession", &Configuration::set_stop_at_session_end);
+       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_GainReduceFastTransport()
+ARDOUR_UI::toggle_punch_out ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action ("options", "GainReduceFastTransport");
-       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
-               } else {
-                       Config->set_quieten_at_speed (1.0); /* no change */
-               }
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchOut"));
+       if (!act) {
+               return;
        }
-}
 
-void
-ARDOUR_UI::toggle_LatchedSolo()
-{
-       toggle_session_state ("options", "LatchedSolo", &Session::set_solo_latched, &Session::solo_latched);
+       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_SoloViaBus()
+ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide ()
 {
-       if (!session) {
+       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");
+       if (!act) {
                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()) {
-                       session->set_solo_model (Session::SoloBus);
-               } else {
-                       session->set_solo_model (Session::InverseMute);
-               }
+       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_AutomaticallyCreateCrossfades()
+ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
 {
+       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_UnmuteNewFullCrossfades()
+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);
+               session->config.set_use_video_sync (tact->get_active());
+       }
 }
 
 void
-ARDOUR_UI::mtc_port_changed ()
+ARDOUR_UI::toggle_editing_space()
 {
-       bool have_mtc;
-
-       if (session) {
-               if (session->mtc_port()) {
-                       have_mtc = true;
+       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 {
-                       have_mtc = false;
+                       restore_editing_space ();
                }
-       } else {
-               have_mtc = false;
-       }
-
-       if (have_mtc) {
-               const gchar *psync_strings[] = {
-                       N_("Internal"),
-                       N_("MTC"),
-                       N_("JACK"),
-                       0
-               };
-               
-               positional_sync_strings = internationalize (psync_strings);
-               
-       } else {
-               const gchar *psync_strings[] = {
-                       N_("Internal"),
-                       N_("JACK"),
-                       0
-               };
-               positional_sync_strings = internationalize (psync_strings);
        }
-       
-       set_popdown_strings (sync_option_combo, positional_sync_strings);
 }
 
 void
-ARDOUR_UI::setup_options ()
+ARDOUR_UI::setup_session_options ()
 {
-       mtc_port_changed ();
-
-       session_control_changed (Session::SlaveType);
-       session_control_changed (Session::SendMTC);
-       session_control_changed (Session::SendMMC);
-       session_control_changed (Session::MMCControl);
-       session_control_changed (Session::MidiFeedback);
-       session_control_changed (Session::MidiControl);
-       session_control_changed (Session::RecordingPlugins);
-       session_control_changed (Session::CrossFadesActive);
-       session_control_changed (Session::SoloLatch);
-       session_control_changed (Session::SoloingModel);
-       session_control_changed (Session::LayeringModel);
-       session_control_changed (Session::CrossfadingModel);
-
-       session->ControlChanged.connect (mem_fun (*this, &ARDOUR_UI::queue_session_control_changed));
+       session->config.ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed));
+       session->config.map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed));
 }
 
+#if 0
 void
-ARDOUR_UI::map_some_session_state (const char* group, const char* action, bool (Session::*get)() const)
+ARDOUR_UI::handle_sync_change ()
 {
        if (!session) {
                return;
        }
-
-       Glib::RefPtr<Action> act = ActionManager::get_action (group, action);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               bool x = (session->*get)();
-               if (tact->get_active() != x) {
-                       tact->set_active (x);
-               }
+       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::queue_session_control_changed (Session::ControlType t)
-{
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &ARDOUR_UI::session_control_changed), t));
 }
+#endif
 
 void
-ARDOUR_UI::session_control_changed (Session::ControlType t)
+ARDOUR_UI::parameter_changed (std::string p)
 {
-       switch (t) {
-       case Session::SlaveType:
-               switch (session->slave_source()) {
-               case Session::None:
-                       sync_option_combo.set_active_text (_("Internal"));
-                       break;
-               case Session::MTC:
-                       sync_option_combo.set_active_text (_("MTC"));
-                       break;
-               case Session::JACK:
-                       sync_option_combo.set_active_text (_("JACK"));
-                       break;
-               }
-               
-               break;
+       ENSURE_GUI_THREAD (bind (mem_fun (*this, &ARDOUR_UI::parameter_changed), p));
 
-       case Session::SendMTC:
-               map_some_session_state ("options", "SendMTC", &Session::get_send_mtc);
-               break;
+       if (p == "external-sync") {
 
-       case Session::SendMMC:
-               map_some_session_state ("options", "SendMMC", &Session::get_send_mmc);
-               break;
+               ActionManager::map_some_state ("Transport", "ToggleExternalSync", mem_fun (session->config, &SessionConfiguration::get_external_sync));
 
-       case Session::MMCControl:       
-               map_some_session_state ("options", "UseMMC", &Session::get_mmc_control);
-               break;
-
-       case Session::MidiFeedback:       
-               map_some_session_state ("options", "SendMIDIfeedback", &Session::get_midi_feedback);
-               break;
+               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 (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 if (p == "send-mtc") {
 
-       case Session::MidiControl:       
-               map_some_session_state ("options", "UseMIDIcontrol", &Session::get_midi_control);
-               break;
+               ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc);
 
-       case Session::RecordingPlugins:
-               map_some_session_state ("options", "RunPluginsWhileRecording", &Session::get_recording_plugins);
-               break;
+       } else if (p == "send-mmc") {
 
-       case Session::CrossFadesActive:
-               map_some_session_state ("options", "CrossfadesActive", &Session::get_crossfades_active);
-               break;
+               ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc);
 
-       case Session::SoloLatch:
-               break;
+       } else if (p == "use-osc") {
 
-       case Session::SoloingModel:
-               switch (session->solo_model()) {
-               case Session::InverseMute:
+#ifdef HAVE_LIBLO
+               if (Config->get_use_osc()) {
+                       osc->start ();
+               } else {
+                       osc->stop ();
+               }
+#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", mem_fun (session->config, &SessionConfiguration::get_auto_play));
+       } else if (p == "auto-return") {
+               ActionManager::map_some_state ("Transport", "ToggleAutoReturn", mem_fun (session->config, &SessionConfiguration::get_auto_return));
+       } else if (p == "auto-input") {
+               ActionManager::map_some_state ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::get_auto_input));
+       } else if (p == "punch-out") {
+               ActionManager::map_some_state ("Transport", "TogglePunchOut", 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", 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", mem_fun (session->config, &SessionConfiguration::get_jack_time_master));
+       } else if (p == "use-video-sync") {
+               ActionManager::map_some_state ("Transport",  "ToggleVideoSync", 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()) {
+                                       shuttle_fract = SHUTTLE_FRACT_SPEED1;
+                                       session->request_transport_speed (1.0);
+                               }
+                       }
                        break;
-               case Session::SoloBus:
+               case Wheel:
+                       shuttle_style_button.set_active_text (_("wheel"));
                        break;
                }
-               break;
-
-       case Session::LayeringModel:
-               break;
-
-       case Session::CrossfadingModel:
-               break;
-
-               
-        // BUTTON STATE: fix me in the future to use actions
-
-
-       case Session::AutoPlay:
-               map_some_session_state (auto_play_button, &Session::get_auto_play);
-               break;
-
-       case Session::AutoLoop:
-               break;
-
-       case Session::AutoReturn:
-               map_some_session_state (auto_return_button, &Session::get_auto_return);
-               break;
 
-       case Session::AutoInput:
-               map_some_session_state (auto_input_button, &Session::get_auto_input);
-               break;
-
-       case Session::PunchOut:
-               map_some_session_state (punch_in_button, &Session::get_punch_out);
-               break;
-
-       case Session::PunchIn:
-               map_some_session_state (punch_in_button, &Session::get_punch_in);
-               break;
-
-       case Session::Clicking:
-               map_some_session_state (click_button, &Session::get_clicking);
-               break;
-
-       default:
-               // somebody else handles this 
-               break;
+       } else if (p == "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 (p == "video-pullup" || p == "timecode-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 (p == "show-track-meters") {
+               editor->toggle_meter_updating();
        }
 }