X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=bade3906a406fe245d182683d9a60a462ea4039c;hb=09efd82c6aea973e3eb9497ef2b09256bf5ddde4;hp=21afbcde212752d62ca2a0df06a5e96982f1b0db;hpb=7bd41538d951c3e476655df741adfbebbb990bde;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 21afbcde21..bade3906a4 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -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 @@ -15,20 +15,29 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + +#include "pbd/convert.h" +#include "pbd/stacktrace.h" #include -#include -#include -#include +#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,377 +45,171 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; - -void -ARDOUR_UI::setup_config_options () -{ - std::vector groups; - groups.push_back("options"); - groups.push_back("Editor"); - groups.push_back("Transport"); - - struct { - char* name; - bool (Configuration::*method)(void) const; - char act_type; //(t)oggle or (r)adio - } options[] = { - { "ToggleTimeMaster", &Configuration::get_jack_time_master, 't' }, - { "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport, 't' }, - { "LatchedRecordEnable", &Configuration::get_latched_record_enable, 't' }, - { "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture, 't' }, - { "StopRecordingOnXrun", &Configuration::get_stop_recording_on_xrun, 't' }, - { "StopTransportAtEndOfSession", &Configuration::get_stop_at_session_end, 't' }, - { "UseHardwareMonitoring", &Configuration::get_use_hardware_monitoring, 'r' }, - { "UseSoftwareMonitoring", &Configuration::get_use_sw_monitoring, 'r' }, - { "UseExternalMonitoring", &Configuration::get_use_external_monitoring, 'r' }, - { "MeterFalloffOff", &Configuration::get_meter_falloff_off, 'r' }, - { "MeterFalloffSlowest", &Configuration::get_meter_falloff_slowest, 'r' }, - { "MeterFalloffSlow", &Configuration::get_meter_falloff_slow, 'r' }, - { "MeterFalloffMedium", &Configuration::get_meter_falloff_medium, 'r' }, - { "MeterFalloffFast", &Configuration::get_meter_falloff_fast, 'r' }, - { "MeterFalloffFaster", &Configuration::get_meter_falloff_faster, 'r' }, - { "MeterFalloffFastest", &Configuration::get_meter_falloff_fastest, 'r' }, - { "MeterHoldOff", &Configuration::get_meter_hold_off, 'r' }, - { "MeterHoldShort", &Configuration::get_meter_hold_short, 'r' }, - { "MeterHoldMedium", &Configuration::get_meter_hold_medium, 'r' }, - { "MeterHoldLong", &Configuration::get_meter_hold_long, 'r' }, - { "ToggleVideoSync", &Configuration::get_use_video_sync, 't' }, - { 0, 0, 0 } - }; - - for (uint32_t n = 0; options[n].name; ++n) { - for (std::vector::iterator i = groups.begin(); i != groups.end(); i++) { - Glib::RefPtr act = ActionManager::get_action (i->c_str(), options[n].name); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - if (options[n].act_type == 't' || options[n].act_type == 'r') { - if ((Config->*(options[n].method))()) { - tact->set_active (true); - } else { - tact->set_active (false); - } - } - continue; - } - } - } -} +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 act = ActionManager::get_action (group, action); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::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) -{ - if (session) { - Glib::RefPtr act = ActionManager::get_action (group, action); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - bool x = (session->*get)(); - - if (x != tact->get_active()) { - (session->*set) (!x); - } - } - } -} - -void -ARDOUR_UI::toggle_session_state (const char* group, const char* action, sigc::slot theSlot) -{ - if (session) { - Glib::RefPtr act = ActionManager::get_action (group, action); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::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); -} - -void -ARDOUR_UI::toggle_AutoConnectNewTrackInputsToHardware() -{ - toggle_session_state ("options", "AutoConnectNewTrackInputsToHardware", &Session::set_input_auto_connect, &Session::get_input_auto_connect); -} -void -ARDOUR_UI::toggle_AutoConnectNewTrackOutputsToHardware() -{ - toggle_session_state ("options", "AutoConnectNewTrackOutputsToHardware", bind (mem_fun (session, &Session::set_output_auto_connect), Session::AutoConnectPhysical)); -} -void -ARDOUR_UI::toggle_AutoConnectNewTrackOutputsToMaster() -{ - toggle_session_state ("options", "AutoConnectNewTrackOutputsToHardware", bind (mem_fun (session, &Session::set_output_auto_connect), Session::AutoConnectMaster)); -} -void -ARDOUR_UI::toggle_ManuallyConnectNewTrackOutputs() -{ - toggle_session_state ("options", "AutoConnectNewTrackOutputsToHardware", bind (mem_fun (session, &Session::set_output_auto_connect), Session::AutoConnectOption (0))); + ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback); } void ARDOUR_UI::toggle_auto_input () { - toggle_session_state ("Transport", "ToggleAutoInput", &Session::set_auto_input, &Session::get_auto_input); + 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_auto_play () { - toggle_session_state ("Transport", "ToggleAutoPlay", &Session::set_auto_play, &Session::get_auto_play); + 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_auto_return () { - toggle_session_state ("Transport", "ToggleAutoReturn", &Session::set_auto_return, &Session::get_auto_return); + 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_click () { - toggle_session_state ("Transport", "ToggleClick", &Session::set_clicking, &Session::get_clicking); + ActionManager::toggle_config_state ("Transport", "ToggleClick", &RCConfiguration::set_clicking, &RCConfiguration::get_clicking); } void ARDOUR_UI::toggle_session_auto_loop () { if (session) { - if (session->get_auto_loop()) { + if (session->get_play_loop()) { if (session->transport_rolling()) { transport_roll(); } else { - session->request_auto_loop (false); + session->request_play_loop (false); } } else { - session->request_auto_loop (true); + session->request_play_loop (true); } } } void -ARDOUR_UI::toggle_punch_in () -{ - toggle_session_state ("Transport", "TogglePunchIn", &Session::set_punch_in, &Session::get_punch_in); -} - -void -ARDOUR_UI::toggle_punch_out () -{ - toggle_session_state ("Transport", "TogglePunchOut", &Session::set_punch_out, &Session::get_punch_out); -} - - void -ARDOUR_UI::toggle_video_sync() +ARDOUR_UI::unset_dual_punch () { - Glib::RefPtr act = ActionManager::get_action ("Transport", "ToggleVideoSync"); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - Config->set_use_video_sync (tact->get_active()); - } -} + Glib::RefPtr action = ActionManager::get_action ("Transport", "TogglePunch"); -void -ARDOUR_UI::toggle_editing_space() -{ - Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMaximalEditor"); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - if (tact->get_active()) { - maximise_editing_space (); - } else { - restore_editing_space (); + if (action) { + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(action); + if (tact) { + ignore_dual_punch = true; + tact->set_active (false); + ignore_dual_punch = false; } } } void -ARDOUR_UI::toggle_UseHardwareMonitoring() +ARDOUR_UI::toggle_punch () { - Glib::RefPtr act = ActionManager::get_action ("options", "UseHardwareMonitoring"); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::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(); - } - } + if (ignore_dual_punch) { + return; } -} -void -ARDOUR_UI::toggle_UseSoftwareMonitoring() -{ - Glib::RefPtr act = ActionManager::get_action ("options", "UseSoftwareMonitoring"); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::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 = ActionManager::get_action ("Transport", "TogglePunch"); -void -ARDOUR_UI::toggle_UseExternalMonitoring() -{ - Glib::RefPtr act = ActionManager::get_action ("options", "UseExternalMonitoring"); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::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(); - } - } - } -} + if (action) { -void -ARDOUR_UI::toggle_StopPluginsWithTransport() -{ - toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport); -} + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(action); -void -ARDOUR_UI::toggle_LatchedRecordEnable() -{ - toggle_config_state ("options", "LatchedRecordEnable", &Configuration::set_latched_record_enable); -} + if (!tact) { + return; + } -void -ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording() -{ - toggle_session_state ("options", "DoNotRunPluginsWhileRecording", &Session::set_do_not_record_plugins, &Session::get_do_not_record_plugins); -} + /* drive the other two actions from this one */ -void -ARDOUR_UI::toggle_VerifyRemoveLastCapture() -{ - toggle_config_state ("options", "VerifyRemoveLastCapture", &Configuration::set_verify_remove_last_capture); + Glib::RefPtr in_action = ActionManager::get_action ("Transport", "TogglePunchIn"); + Glib::RefPtr out_action = ActionManager::get_action ("Transport", "TogglePunchOut"); + + if (in_action && out_action) { + Glib::RefPtr tiact = Glib::RefPtr::cast_dynamic(in_action); + Glib::RefPtr toact = Glib::RefPtr::cast_dynamic(out_action); + tiact->set_active (tact->get_active()); + toact->set_active (tact->get_active()); + } + } } void -ARDOUR_UI::toggle_StopRecordingOnXrun() +ARDOUR_UI::toggle_punch_in () { - toggle_config_state ("options", "StopRecordingOnXrun", &Configuration::set_stop_recording_on_xrun); + ActionManager::toggle_config_state_foo ("Transport", "TogglePunchIn", mem_fun (session->config, &SessionConfiguration::set_punch_in), mem_fun (session->config, &SessionConfiguration::get_punch_in)); } void -ARDOUR_UI::toggle_StopTransportAtEndOfSession() +ARDOUR_UI::toggle_punch_out () { - toggle_config_state ("options", "StopTransportAtEndOfSession", &Configuration::set_stop_at_session_end); + ActionManager::toggle_config_state_foo ("Transport", "TogglePunchOut", mem_fun (session->config, &SessionConfiguration::set_punch_out), mem_fun (session->config, &SessionConfiguration::get_punch_out)); } void -ARDOUR_UI::toggle_GainReduceFastTransport() +ARDOUR_UI::toggle_video_sync() { - Glib::RefPtr act = ActionManager::get_action ("options", "GainReduceFastTransport"); + Glib::RefPtr act = ActionManager::get_action ("Transport", "ToggleVideoSync"); if (act) { Glib::RefPtr tact = Glib::RefPtr::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 */ - } + session->config.set_use_video_sync (tact->get_active()); } } void -ARDOUR_UI::toggle_LatchedSolo() -{ - toggle_session_state ("options", "LatchedSolo", &Session::set_solo_latched, &Session::solo_latched); -} - -void -ARDOUR_UI::toggle_SoloViaBus() +ARDOUR_UI::toggle_editing_space() { - if (!session) { - return; - } - - Glib::RefPtr act = ActionManager::get_action ("options", "SoloViaBus"); + Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMaximalEditor"); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - if (tact->get_active()) { - session->set_solo_model (Session::SoloBus); + maximise_editing_space (); } else { - session->set_solo_model (Session::InverseMute); + restore_editing_space (); } } } -void -ARDOUR_UI::toggle_AutomaticallyCreateCrossfades() -{ -} -void -ARDOUR_UI::toggle_UnmuteNewFullCrossfades() -{ -} - void ARDOUR_UI::mtc_port_changed () { bool have_mtc; + bool have_midi_clock; if (session) { if (session->mtc_port()) { @@ -414,29 +217,26 @@ ARDOUR_UI::mtc_port_changed () } else { have_mtc = false; } + if (session->midi_clock_port()) { + have_midi_clock = true; + } else { + have_midi_clock = false; + } } else { have_mtc = false; + have_midi_clock = false; } + positional_sync_strings.clear (); + positional_sync_strings.push_back (slave_source_to_string (None)); if (have_mtc) { - const gchar *psync_strings[] = { - N_("Internal"), - N_("MTC"), - N_("JACK"), - 0 - }; - - positional_sync_strings = PBD::internationalize (psync_strings); - - } else { - const gchar *psync_strings[] = { - N_("Internal"), - N_("JACK"), - 0 - }; - positional_sync_strings = PBD::internationalize (psync_strings); + positional_sync_strings.push_back (slave_source_to_string (MTC)); + } + if (have_midi_clock) { + positional_sync_strings.push_back (slave_source_to_string (MIDIClock)); } - + positional_sync_strings.push_back (slave_source_to_string (JACK)); + set_popdown_strings (sync_option_combo, positional_sync_strings); } @@ -445,147 +245,113 @@ 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_control_changed (Session::PunchOut); - session_control_changed (Session::PunchIn); - session_control_changed (Session::AutoPlay); - session_control_changed (Session::AutoReturn); - session_control_changed (Session::AutoInput); - session_control_changed (Session::Clicking); - session_control_changed (Session::SmpteMode); - - session->ControlChanged.connect (mem_fun (*this, &ARDOUR_UI::queue_session_control_changed)); + Config->ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed)); } void -ARDOUR_UI::map_some_session_state (const char* group, const char* action, bool (Session::*get)() const) +ARDOUR_UI::parameter_changed (std::string p) { - if (!session) { - return; - } + ENSURE_GUI_THREAD (bind (mem_fun (*this, &ARDOUR_UI::parameter_changed), p)); - Glib::RefPtr act = ActionManager::get_action (group, action); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - bool x = (session->*get)(); - if (tact->get_active() != x) { - tact->set_active (x); - } - } -} + if (p == "slave-source") { -void -ARDOUR_UI::queue_session_control_changed (Session::ControlType t) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &ARDOUR_UI::session_control_changed), t)); -} + sync_option_combo.set_active_text (slave_source_to_string (Config->get_slave_source())); -void -ARDOUR_UI::session_control_changed (Session::ControlType t) -{ - switch (t) { - case Session::SlaveType: - switch (session->slave_source()) { - case Session::None: - sync_option_combo.set_active_text (_("Internal")); + switch (Config->get_slave_source()) { + case None: + ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true); + ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true); break; - case Session::MTC: - sync_option_combo.set_active_text (_("MTC")); - break; - case Session::JACK: - sync_option_combo.set_active_text (_("JACK")); + + 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; } - - break; - - case Session::SendMTC: - map_some_session_state ("options", "SendMTC", &Session::get_send_mtc); - break; - case Session::SendMMC: - map_some_session_state ("options", "SendMMC", &Session::get_send_mmc); - break; + } else if (p == "send-mtc") { - case Session::MMCControl: - map_some_session_state ("options", "UseMMC", &Session::get_mmc_control); - break; + ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc); - case Session::MidiFeedback: - map_some_session_state ("options", "SendMIDIfeedback", &Session::get_midi_feedback); - break; + } else if (p == "send-mmc") { - case Session::MidiControl: - map_some_session_state ("options", "UseMIDIcontrol", &Session::get_midi_control); - break; + ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc); - case Session::RecordingPlugins: - map_some_session_state ("options", "DoNotRunPluginsWhileRecording", &Session::get_do_not_record_plugins); - break; + } else if (p == "use-osc") { - case Session::CrossFadesActive: - map_some_session_state ("options", "CrossfadesActive", &Session::get_crossfades_active); - break; - - case Session::SoloLatch: - break; - - 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; - - case Session::AutoPlay: - map_some_session_state ("Transport", "ToggleAutoPlay", &Session::get_auto_play); - break; - case Session::AutoLoop: - break; - - case Session::AutoReturn: - map_some_session_state ("Transport", "ToggleAutoReturn", &Session::get_auto_return); - break; - - case Session::AutoInput: - map_some_session_state ("Transport", "ToggleAutoInput", &Session::get_auto_input); - break; - - case Session::PunchOut: - map_some_session_state ("Transport", "TogglePunchOut", &Session::get_punch_out); - break; - - case Session::PunchIn: - map_some_session_state ("Transport", "TogglePunchIn", &Session::get_punch_in); - break; - - case Session::Clicking: - map_some_session_state ("Transport", "ToggleClick", &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 == "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 (p == "show-track-meters") { + editor->toggle_meter_updating(); } }