diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bcb94fbdcb..6231f9fc49 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -181,7 +181,6 @@ #include "template_dialog.h" #include "time_axis_view_item.h" #include "timers.h" -#include "application_bar.h" //TODO: remove this and put in Rec/Edit/Mix/Cue #include "transport_masters_dialog.h" #include "trigger_page.h" #include "triggerbox_ui.h" diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 1955b1df96..fcb6d92f15 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -531,8 +531,6 @@ private: void set_transport_controllable_state (const XMLNode&); XMLNode& get_transport_controllable_state (); - ApplicationBar *application_bar; - void toggle_external_sync (); void toggle_time_master (); void toggle_video_sync (); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index f5568767de..f55add0ba4 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -65,7 +65,6 @@ #include "main_clock.h" #include "mixer_ui.h" #include "recorder_ui.h" -#include "application_bar.h" //TODO: move to each window #include "trigger_page.h" #include "utils.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"))); 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 */ 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)); @@ -269,9 +266,6 @@ ARDOUR_UI::setup_transport () int col = 0; #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 (trigger_page_visibility_button, TCOL, 1, 2 , FILL, SHRINK, hpadding, vpadding); ++col; diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 8d8a44752b..97e9196b0c 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -84,7 +84,6 @@ #include "splash.h" #include "sfdb_ui.h" #include "timers.h" -#include "application_bar.h" //TODO: remove #include "transport_masters_dialog.h" #include "trigger_page.h" #include "virtual_keyboard_window.h" @@ -122,8 +121,6 @@ ARDOUR_UI::set_session (Session *s) ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false); } - application_bar->set_session (s); - update_path_label (); update_sample_rate (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 6b8518eb5b..e93c74e2de 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -1054,9 +1054,7 @@ ARDOUR_UI::on_theme_changed () void ARDOUR_UI::focus_on_clock () { - if (application_bar) { - application_bar->focus_on_clock (); - } + // TODO cast to a tabbable and call focus_on_clock to its clock } bool