ardour/livetrax
13
0
Fork 0
Code

TransportClocks can do some of their own housekeeping

Browse Source
This commit is contained in:
Ben Loftis 2024-09-27 10:12:20 -05:00 committed by Robin Gareus
parent bf3fc3f92a
commit 1cc8b8ae5b
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/application_bar.cc
View File

@ -553,10 +553,6 @@ ApplicationBar::parameter_changed (std::string p)
} else { } else {
UI::instance()->set_tip (_sync_button, _("External sync is not possible: video pull up/down is set")); UI::instance()->set_tip (_sync_button, _("External sync is not possible: video pull up/down is set"));
} }
} else if (p == "primary-clock-delta-mode") {
// primary_clock->set_display_delta_mode(UIConfiguration::instance().get_primary_clock_delta_mode());
} else if (p == "secondary-clock-delta-mode") {
// secondary_clock->set_display_delta_mode(UIConfiguration::instance().get_secondary_clock_delta_mode());
} else if (p == "show-mini-timeline") { } else if (p == "show-mini-timeline") {
repack_transport_hbox (); repack_transport_hbox ();
} else if (p == "show-dsp-load-info") { } else if (p == "show-dsp-load-info") {

23
gtk2_ardour/ardour_ui.cc
View File

@ -2247,29 +2247,6 @@ ARDOUR_UI::save_state_canfail (string name, bool switch_to_it)
return 0; return 0;
} }
void
ARDOUR_UI::primary_clock_value_changed ()
{
if (_session) {
_session->request_locate (primary_clock->last_when ().samples());
}
}
void
ARDOUR_UI::big_clock_value_changed ()
{
if (_session) {
_session->request_locate (big_clock->last_when ().samples());
}
}
void
ARDOUR_UI::secondary_clock_value_changed ()
{
if (_session) {
_session->request_locate (secondary_clock->last_when ().samples());
}
}
void void
ARDOUR_UI::save_template_dialog_response (int response, SaveTemplateDialog* d) ARDOUR_UI::save_template_dialog_response (int response, SaveTemplateDialog* d)
{ {

11
gtk2_ardour/ardour_ui.h
View File

@ -310,11 +310,12 @@ public:
GUIObjectState* gui_object_state; GUIObjectState* gui_object_state;
MainClock* primary_clock; MainClock* primary_clock; //this clock is the canonical PrimaryClock, whose mode is reflected to all other clocks with PrimaryClock disposition.
MainClock* secondary_clock; MainClock* secondary_clock; //this clock is the canonical SecondaryClock, whose mode is reflected to all other clocks with PrimaryClock disposition
void focus_on_clock ();
AudioClock* big_clock; AudioClock* big_clock;
void focus_on_clock ();
VideoTimeLine *video_timeline; VideoTimeLine *video_timeline;
void reset_main_clocks (); void reset_main_clocks ();
@ -587,10 +588,6 @@ private:
void audition_alert_clicked (); void audition_alert_clicked ();
bool error_alert_press (GdkEventButton *); bool error_alert_press (GdkEventButton *);
void big_clock_value_changed ();
void primary_clock_value_changed ();
void secondary_clock_value_changed ();
/* menu bar and associated stuff */ /* menu bar and associated stuff */
Gtk::MenuBar* menu_bar; Gtk::MenuBar* menu_bar;

6
gtk2_ardour/ardour_ui2.cc
View File

@ -240,12 +240,6 @@ ARDOUR_UI::setup_transport ()
ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &MainClock::set), false)); ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &MainClock::set), false));
ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &MainClock::set), false)); ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &MainClock::set), false));
primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
primary_clock->change_display_delta_mode_signal.connect (sigc::mem_fun(UIConfiguration::instance(), &UIConfiguration::set_primary_clock_delta_mode));
secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
secondary_clock->change_display_delta_mode_signal.connect (sigc::mem_fun(UIConfiguration::instance(), &UIConfiguration::set_secondary_clock_delta_mode));
big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
editor_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), editor)); editor_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), editor));
mixer_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), mixer)); mixer_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), mixer));
prefs_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), rc_option_editor)); prefs_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), rc_option_editor));

4
gtk2_ardour/ardour_ui_options.cc
View File

@ -384,10 +384,6 @@ ARDOUR_UI::parameter_changed (std::string p)
} else if (p == "show-track-meters") { } else if (p == "show-track-meters") {
if (editor) editor->toggle_meter_updating(); if (editor) editor->toggle_meter_updating();
} else if (p == "primary-clock-delta-mode") {
primary_clock->set_display_delta_mode(UIConfiguration::instance().get_primary_clock_delta_mode());
} else if (p == "secondary-clock-delta-mode") {
secondary_clock->set_display_delta_mode(UIConfiguration::instance().get_secondary_clock_delta_mode());
} else if (p == "super-rapid-clock-update") { } else if (p == "super-rapid-clock-update") {
if (_session) { if (_session) {
stop_clocking (); stop_clocking ();