diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 15 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 10 |
5 files changed, 9 insertions, 21 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 2606e7ce4b..823d2d45fd 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -157,8 +157,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) , auto_play_button (ArdourButton::led_default_elements) , auto_input_button (ArdourButton::led_default_elements) - , time_master_button (ArdourButton::led_default_elements) - , auditioning_alert_button (_("Audition")) , solo_alert_button (_("Solo")) , feedback_alert_button (_("Feedback")) diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index cb74c12a11..f42f936f32 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -439,7 +439,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ArdourButton auto_play_button; ArdourButton auto_input_button; ArdourButton click_button; - ArdourButton time_master_button; ArdourButton sync_button; ArdourButton auditioning_alert_button; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 98a8d4ecc5..e631173a36 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -138,7 +138,6 @@ ARDOUR_UI::setup_tooltips () set_tip (auto_play_button, _("Start playback after any locate")); set_tip (auto_input_button, _("Be sensible about input monitoring")); set_tip (click_button, _("Enable/Disable audio click")); - set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME)); set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything")); set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition")); set_tip (feedback_alert_button, _("When active, there is a feedback loop.")); @@ -255,15 +254,12 @@ ARDOUR_UI::setup_transport () auto_return_button.set_name ("transport option button"); auto_play_button.set_name ("transport option button"); auto_input_button.set_name ("transport option button"); - time_master_button.set_name ("transport option button"); /* these have to provide a clear indication of active state */ click_button.set_name ("transport active option button"); sync_button.set_name ("transport active option button"); - time_master_button.set_text (_("time master")); - stop_button.set_active_state (Active); goto_start_button.set_image (get_icon (X_("transport_start"))); @@ -295,9 +291,6 @@ ARDOUR_UI::setup_transport () play_selection_button.set_related_action (act); act = ActionManager::get_action (X_("MIDI"), X_("panic")); midi_panic_button.set_related_action (act); - - act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster")); - time_master_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); sync_button.set_related_action (act); @@ -410,14 +403,6 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*auto_box, false, false); } -/* - VBox* time_controls = manage (new VBox); - time_controls->set_spacing (2); - time_controls->set_homogeneous (true); - time_controls->pack_start (sync_button, true, false); - time_controls->pack_start (time_master_button, true, false); -*/ - transport_tearoff_hbox.pack_start (*clock_box, false, false); transport_tearoff_hbox.pack_start (click_button, false, false); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 866cb6afb4..94bcafbc16 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -359,8 +359,6 @@ 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") { diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index b382fa1025..ce461436b8 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -55,7 +55,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s) add_option (_("Timecode"), new OptionEditorHeading (_("Timecode Settings"))); - ComboOption<TimecodeFormat>* smf = new ComboOption<TimecodeFormat> ( "timecode-format", _("Timecode frames-per-second"), @@ -132,6 +131,15 @@ SessionOptionEditor::SessionOptionEditor (Session* s) sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_offset_negative) )); + add_option (_("Timecode"), new OptionEditorHeading (_("JACK Transport/Time Settings"))); + + add_option (_("Timecode"), new BoolOption ( + "jack-time-master", + _("Ardour is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"), + sigc::mem_fun (*_session_config, &SessionConfiguration::get_jack_time_master), + sigc::mem_fun (*_session_config, &SessionConfiguration::set_jack_time_master) + )); + /* FADES */ ComboOption<CrossfadeModel>* cfm = new ComboOption<CrossfadeModel> ( |