ardour/livetrax
13
0
Fork 0
Code

Use Transport Bar in top-level pages

Browse Source
This commit is contained in:
Ben Loftis 2024-10-07 08:32:27 -05:00 committed by Robin Gareus
parent b2e4dd91b9
commit 1b18c3e76c
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
8 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/editor.cc
View File

@ -1225,6 +1225,7 @@ Editor::set_session (Session *t)
* before the visible state has been loaded from instant.xml */
_leftmost_sample = session_gui_extents().first.samples();
_application_bar.set_session (_session);
nudge_clock->set_session (_session);
_summary->set_session (_session);
_group_tabs->set_session (_session);

2
gtk2_ardour/editor.h
View File

@ -66,6 +66,7 @@
#include "widgets/ardour_spacer.h"
#include "widgets/pane.h"
#include "application_bar.h"
#include "ardour_dialog.h"
#include "public_editor.h"
#include "editing.h"
@ -773,6 +774,7 @@ private:
Gdk::Cursor* which_trim_cursor (bool left_side) const;
Gdk::Cursor* which_canvas_cursor (ItemType type) const;
ApplicationBar _application_bar;
ArdourCanvas::GtkCanvas* _track_canvas;
ArdourCanvas::GtkCanvasViewport* _track_canvas_viewport;

2
gtk2_ardour/mixer_ui.cc
View File

@ -1280,6 +1280,8 @@ Mixer_UI::set_session (Session* sess)
_group_tabs->set_session (sess);
_application_bar.set_session (_session);
update_scene_buttons();
RefPtr<ToggleAction> surround_action = ActionManager::get_toggle_action (X_("Mixer"), "ToggleSurroundMaster");

3
gtk2_ardour/mixer_ui.h
View File

@ -55,6 +55,7 @@
#include "widgets/tabbable.h"
#include "widgets/ardour_dropdown.h"
#include "application_bar.h"
#include "axis_provider.h"
#include "enums.h"
#include "monitor_section.h"
@ -334,6 +335,8 @@ private:
void track_column_click (gint);
void build_track_menu ();
ApplicationBar _application_bar;
MonitorSection _monitor_section;
PluginSelector* _plugin_selector;
SurroundStrip* _surround_strip;

21
gtk2_ardour/recorder_ui.cc
View File

@ -101,12 +101,6 @@ RecorderUI::RecorderUI ()
load_bindings ();
register_actions ();
_transport_ctrl.setup (ARDOUR_UI::instance ());
_transport_ctrl.map_actions ();
_transport_ctrl.set_no_show_all ();
signal_tabbed_changed.connect (sigc::mem_fun (*this, &RecorderUI::tabbed_changed));
/* monitoring */
_auto_input_button.set_related_action (ActionManager::get_action ("Transport", "ToggleAutoInput"));
_auto_input_button.set_name ("transport option button");
@ -209,9 +203,6 @@ RecorderUI::RecorderUI ()
int spacepad = 3;
int col = 0;
_button_table.attach (_transport_ctrl, col, col + 1, 0, 1, FILL, FILL, hpadding, vpadding);
col += 1;
_button_table.attach (_duration_info_box, col, col + 1, 0, 1, FILL, FILL, hpadding, vpadding);
_button_table.attach (_xrun_info_box, col + 1, col + 2, 0, 1, FILL, FILL, hpadding, vpadding);
_button_table.attach (_btn_rec_forget, col, col + 2, 1, 2, FILL, SHRINK, hpadding, vpadding);
@ -356,16 +347,6 @@ RecorderUI::use_own_window (bool and_fill_it)
return win;
}
void
RecorderUI::tabbed_changed (bool tabbed)
{
if (tabbed) {
_transport_ctrl.hide ();
} else {
_transport_ctrl.show ();
}
}
XMLNode&
RecorderUI::get_state () const
{
@ -408,7 +389,7 @@ RecorderUI::set_session (Session* s)
_duration_info_box.set_session (s);
_xrun_info_box.set_session (s);
_remain_info_box.set_session (s);
_transport_ctrl.set_session (s);
_application_bar.set_session (s);
_rec_group_tabs->set_session (s);
update_sensitivity ();

5
gtk2_ardour/recorder_ui.h
View File

@ -43,10 +43,10 @@
#include "widgets/pane.h"
#include "widgets/tabbable.h"
#include "application_bar.h"
#include "input_port_monitor.h"
#include "rec_info_box.h"
#include "shuttle_control.h"
#include "transport_control_ui.h"
namespace ARDOUR {
class SoloMuteRelease;
@ -99,7 +99,6 @@ private:
void tra_name_edit (TrackRecordAxis*, bool);
void update_rec_table_layout ();
void update_spacer_width (Gtk::Allocation&, TrackRecordAxis*);
void tabbed_changed (bool);
void set_connections (std::string const&);
void port_connected_or_disconnected (std::string, std::string);
@ -154,7 +153,7 @@ private:
DurationInfoBox _duration_info_box;
XrunInfoBox _xrun_info_box;
RemainInfoBox _remain_info_box;
TransportControlUI _transport_ctrl;
ApplicationBar _application_bar;
Glib::RefPtr<Gtk::SizeGroup> _toolbar_button_height;
Glib::RefPtr<Gtk::SizeGroup> _toolbar_recarm_width;
Glib::RefPtr<Gtk::SizeGroup> _toolbar_monitoring_width;

2
gtk2_ardour/trigger_page.cc
View File

@ -42,6 +42,7 @@
#include "ardour/stripable.h"
#include "actions.h"
#include "application_bar.h"
#include "ardour_ui.h"
#include "editor.h"
#include "gui_thread.h"
@ -256,6 +257,7 @@ TriggerPage::set_session (Session* s)
{
SessionHandlePtr::set_session (s);
_application_bar.set_session (_session);
_cue_box.set_session (s);
_trigger_clip_picker.set_session (s);
_master.set_session (s);

3
gtk2_ardour/trigger_page.h
View File

@ -28,6 +28,7 @@
#include "widgets/pane.h"
#include "widgets/tabbable.h"
#include "application_bar.h"
#include "audio_region_operations_box.h"
#include "audio_region_properties_box.h"
#include "audio_trigger_properties_box.h"
@ -104,6 +105,8 @@ private:
gint stop_updating ();
void fast_update_strips ();
ApplicationBar _application_bar;
Gtkmm2ext::Bindings* bindings;
ArdourWidgets::VPane _content;