X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_options.cc;h=27750eeb4384f62b33fc3ff72a2769f64f97ea89;hb=b4d7120a58cb3fc2a49542acab868e0eb0790864;hp=d4a681a165ae1812e5bf551554e3904209496718;hpb=ed5e141b7188187687bbbcd0dea5b3b74834ddd7;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index d4a681a165..27750eeb43 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -35,6 +35,7 @@ #include "ardour/osc.h" #endif +#include "audio_clock.h" #include "ardour_ui.h" #include "actions.h" #include "gui_thread.h" @@ -51,26 +52,26 @@ 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\ + 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)); - } + 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 @@ -240,12 +241,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 +279,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()) { @@ -296,27 +298,6 @@ ARDOUR_UI::setup_session_options () _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) { @@ -327,16 +308,16 @@ ARDOUR_UI::parameter_changed (std::string p) 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); } else { - sync_button.set_label (sync_source_to_string (_session->config.get_sync_source())); + 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 if (p == "send-mtc") { ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc); @@ -379,56 +360,48 @@ 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 == "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 (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") { - synchronize_sync_source_and_video_pullup (); + synchronize_sync_source_and_video_pullup (); reset_main_clocks (); - } else if (p == "sync-source") { + } else if (p == "sync-source") { - synchronize_sync_source_and_video_pullup (); + synchronize_sync_source_and_video_pullup (); } 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()); - } else if (p == "secondary-clock-delta-edit-cursor") { - secondary_clock.set_is_duration (Config->get_secondary_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") { + 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::session_parameter_changed (std::string p) +{ + if (p == "native-file-data-format" || p == "native-file-header-format") { + update_format (); + } } void @@ -437,50 +410,50 @@ 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); } } void ARDOUR_UI::synchronize_sync_source_and_video_pullup () { - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); - - if (!act) { - return; - } - - if (!_session) { - goto just_label; - } - - 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); - } - } - - /* XXX should really be able to set the video pull up - action to insensitive/sensitive, but there is no action. - FIXME - */ + Glib::RefPtr act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); + + if (!act) { + return; + } + + if (!_session) { + goto just_label; + } + + 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); + } + } + + /* XXX should really be able to set the video pull up + action to insensitive/sensitive, but there is no action. + FIXME + */ 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")); - } + 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")); + } }