X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fardour_ui_options.cc;h=15c58a8b8d3b1e151531a80b05c505761f2c965d;hb=89b0beb2ddf002e8d95ad89148e2c7e395294b0c;hp=a0d106fe355e08879c4449f5c7649e2845cefbec;hpb=718b2eab6706f304e398f036e3d817567cd746e8;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index a0d106fe35..15c58a8b8d 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -26,19 +26,21 @@ #include -#include "ardour/configuration.h" -#include "ardour/session.h" -#include "ardour/audioengine.h" #include "ardour/rc_configuration.h" +#include "ardour/session.h" #ifdef HAVE_LIBLO #include "ardour/osc.h" #endif +#include "canvas/wave_view.h" + +#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" @@ -51,8 +53,8 @@ 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 (); + + ARDOUR_UI::update_tearoff_visibility(); } void @@ -60,7 +62,7 @@ ARDOUR_UI::toggle_external_sync() { if (_session) { if (_session->config.get_video_pullup() != 0.0f) { - if (_session->config.get_sync_source() == JACK) { + if (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.")); @@ -68,8 +70,19 @@ when the pull up/down setting is non-zero.")); 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)); + + /* activating a slave is a session-property. + * The slave type is a RC property. + * When the slave is active is must not be reconfigured. + * This is a UI limitation, imposed by audio-clock and + * status displays which combine RC-config & session-properties. + * + * Notficy RCOptionEditor by emitting a signal if the active + * status changed: + */ + Config->ParameterChanged("sync-source"); } } @@ -240,12 +253,12 @@ ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide () } act->set_sensitive (false); - + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); if (!tact) { return; } - + if (!tact->get_active()) { tact->set_active (); } @@ -278,6 +291,7 @@ 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()) { @@ -291,52 +305,35 @@ ARDOUR_UI::toggle_editing_space() void ARDOUR_UI::setup_session_options () { - _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context()); + _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context()); boost::function pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); _session->config.map_parameters (pc); } -#if 0 -void -ARDOUR_UI::handle_sync_change () -{ - if (!_session) { - return; - } - 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); - } - -} -#endif - void ARDOUR_UI::parameter_changed (std::string p) { - ENSURE_GUI_THREAD (*this, &ARDOUR_UI::parameter_changed, p) - if (p == "external-sync") { ActionManager::map_some_state ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync)); if (!_session->config.get_external_sync()) { - sync_button.set_label (_("Internal")); + sync_button.set_text (_("Internal")); ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true); ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true); + ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true); } else { - sync_button.set_label (sync_source_to_string (_session->config.get_sync_source(), true)); + sync_button.set_text (sync_source_to_string (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); + ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false); } - + + } else if (p == "always-play-range") { + + ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_always_play_range); + } else if (p == "send-mtc") { ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc); @@ -379,14 +376,13 @@ ARDOUR_UI::parameter_changed (std::string p) } } else if (p == "clicking") { ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking); - } else if (p == "jack-time-master") { - ActionManager::map_some_state ("Transport", "ToggleTimeMaster", sigc::mem_fun (_session->config, &SessionConfiguration::get_jack_time_master)); } else if (p == "use-video-sync") { ActionManager::map_some_state ("Transport", "ToggleVideoSync", sigc::mem_fun (_session->config, &SessionConfiguration::get_use_video_sync)); } else if (p == "video-pullup" || p == "timecode-format") { synchronize_sync_source_and_video_pullup (); reset_main_clocks (); + editor->queue_visual_videotimeline_update(); } else if (p == "sync-source") { @@ -395,9 +391,38 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "show-track-meters") { editor->toggle_meter_updating(); } else if (p == "primary-clock-delta-edit-cursor") { - primary_clock.set_is_duration (Config->get_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"); + } } else if (p == "secondary-clock-delta-edit-cursor") { - secondary_clock.set_is_duration (Config->get_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"); + } + } else if (p == "super-rapid-clock-update") { + stop_clocking (); + start_clocking (); + } else if (p == "waveform-gradient-depth") { + ArdourCanvas::WaveView::set_global_gradient_depth (config()->get_waveform_gradient_depth()); + } +} + +void +ARDOUR_UI::session_parameter_changed (std::string p) +{ + if (p == "native-file-data-format" || p == "native-file-header-format") { + update_format (); } } @@ -407,11 +432,11 @@ ARDOUR_UI::reset_main_clocks () ENSURE_GUI_THREAD (*this, &ARDOUR_UI::reset_main_clocks) if (_session) { - primary_clock.set (_session->audible_frame(), true); - secondary_clock.set (_session->audible_frame(), true); + 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); + primary_clock->set (0, true); + secondary_clock->set (0, true); } } @@ -433,7 +458,7 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup () act->set_sensitive (true); } else { /* can't sync to JACK if video pullup != 0.0 */ - if (_session->config.get_sync_source() == JACK) { + if (Config->get_sync_source() == JACK) { act->set_sensitive (false); } else { act->set_sensitive (true);