ardour/livetrax
13
0
Fork 0
Code

ArdourUI no longer has his own transport bar

Browse Source
This commit is contained in:
Ben Loftis 2024-11-08 17:41:33 +01:00 committed by Robin Gareus
parent 4b1e09f810
commit 166c446974
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
View File

@ -181,7 +181,6 @@
#include "template_dialog.h" #include "template_dialog.h"
#include "time_axis_view_item.h" #include "time_axis_view_item.h"
#include "timers.h" #include "timers.h"
#include "application_bar.h" //TODO: remove this and put in Rec/Edit/Mix/Cue
#include "transport_masters_dialog.h" #include "transport_masters_dialog.h"
#include "trigger_page.h" #include "trigger_page.h"
#include "triggerbox_ui.h" #include "triggerbox_ui.h"

2
gtk2_ardour/ardour_ui.h
View File

@ -531,8 +531,6 @@ private:
void set_transport_controllable_state (const XMLNode&); void set_transport_controllable_state (const XMLNode&);
XMLNode& get_transport_controllable_state (); XMLNode& get_transport_controllable_state ();
ApplicationBar *application_bar;
void toggle_external_sync (); void toggle_external_sync ();
void toggle_time_master (); void toggle_time_master ();
void toggle_video_sync (); void toggle_video_sync ();

6
gtk2_ardour/ardour_ui2.cc
View File

@ -65,7 +65,6 @@
#include "main_clock.h" #include "main_clock.h"
#include "mixer_ui.h" #include "mixer_ui.h"
#include "recorder_ui.h" #include "recorder_ui.h"
#include "application_bar.h" //TODO: move to each window
#include "trigger_page.h" #include "trigger_page.h"
#include "utils.h" #include "utils.h"
#include "midi_tracer.h" #include "midi_tracer.h"
@ -179,8 +178,6 @@ ARDOUR_UI::setup_transport ()
recorder_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-recorder-visibility"))); recorder_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-recorder-visibility")));
trigger_page_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-trigger-visibility"))); trigger_page_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-trigger-visibility")));
application_bar = new ApplicationBar (); //TODO: move this to Editor, Cue, Rec, Mix //TODO: all transport, ui and monitor actions need to be instantiated before this
/* connect signals */ /* connect signals */
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));
@ -269,9 +266,6 @@ ARDOUR_UI::setup_transport ()
int col = 0; int col = 0;
#define TCOL col, col + 1 #define TCOL col, col + 1
transport_table.attach (*application_bar, TCOL, 0, 2 , EXPAND|FILL, EXPAND|FILL, 3, 0);
++col;
transport_table.attach (recorder_visibility_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding); transport_table.attach (recorder_visibility_button, TCOL, 0, 1 , FILL, SHRINK, hpadding, vpadding);
transport_table.attach (trigger_page_visibility_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding); transport_table.attach (trigger_page_visibility_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding);
++col; ++col;

3
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -84,7 +84,6 @@
#include "splash.h" #include "splash.h"
#include "sfdb_ui.h" #include "sfdb_ui.h"
#include "timers.h" #include "timers.h"
#include "application_bar.h" //TODO: remove
#include "transport_masters_dialog.h" #include "transport_masters_dialog.h"
#include "trigger_page.h" #include "trigger_page.h"
#include "virtual_keyboard_window.h" #include "virtual_keyboard_window.h"
@ -122,8 +121,6 @@ ARDOUR_UI::set_session (Session *s)
ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
} }
application_bar->set_session (s);
update_path_label (); update_path_label ();
update_sample_rate (); update_sample_rate ();

4
gtk2_ardour/ardour_ui_ed.cc
View File

@ -1054,9 +1054,7 @@ ARDOUR_UI::on_theme_changed ()
void void
ARDOUR_UI::focus_on_clock () ARDOUR_UI::focus_on_clock ()
{ {
if (application_bar) { // TODO cast to a tabbable and call focus_on_clock to its clock
application_bar->focus_on_clock ();
}
} }
bool bool