smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

alternate layout with a full-height editor-mixer, for mixbus

Browse source
This commit is contained in:
Ben Loftis 2014-07-28 11:27:02 -05:00
parent df2a8fccc7
commit 02af7cb418
4 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/ardour_ui2.cc
View file

@ -112,9 +112,9 @@ ARDOUR_UI::setup_windows ()
top_packer.pack_start (menu_bar_base, false, false); top_packer.pack_start (menu_bar_base, false, false);
#endif #endif
top_packer.pack_start (transport_frame, false, false); editor->add_toplevel_menu (top_packer);
editor->add_toplevel_controls (top_packer); editor->add_transport_frame (transport_frame);
setup_transport(); setup_transport();

16
gtk2_ardour/editor.cc
View file

@ -802,12 +802,24 @@ Editor::button_settings () const
} }
void void
Editor::add_toplevel_controls (Container& cont) Editor::add_toplevel_menu (Container& cont)
{ {
vpacker.pack_start (cont, false, false); vpacker.pack_start (cont, false, false);
cont.show_all (); cont.show_all ();
} }
void
Editor::add_transport_frame (Container& cont)
{
if(ARDOUR::Profile->get_mixbus()) {
global_vpacker.pack_start (cont, false, false);
global_vpacker.reorder_child (cont, 0);
cont.show_all ();
} else {
vpacker.pack_start (cont, false, false);
}
}
bool bool
Editor::get_smart_mode () const Editor::get_smart_mode () const
{ {
@ -3023,7 +3035,7 @@ Editor::setup_toolbar ()
if (!ARDOUR::Profile->get_trx()) { if (!ARDOUR::Profile->get_trx()) {
hbox->pack_start (snap_box, false, false); hbox->pack_start (snap_box, false, false);
if (!Profile->get_small_screen()) { if ( !Profile->get_small_screen() || Profile->get_mixbus() ) {
hbox->pack_start (*nudge_box, false, false); hbox->pack_start (*nudge_box, false, false);
} else { } else {
ARDOUR_UI::instance()->editor_transport_box().pack_start (*nudge_box, false, false); ARDOUR_UI::instance()->editor_transport_box().pack_start (*nudge_box, false, false);

5
gtk2_ardour/editor.h
View file

@ -277,7 +277,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void export_range (); void export_range ();
void export_region (); void export_region ();
void add_toplevel_controls (Gtk::Container&); void add_transport_frame (Gtk::Container&);
void add_toplevel_menu (Gtk::Container&);
Gtk::HBox& get_status_bar_packer() { return status_bar_hpacker; } Gtk::HBox& get_status_bar_packer() { return status_bar_hpacker; }
void set_zoom_focus (Editing::ZoomFocus); void set_zoom_focus (Editing::ZoomFocus);
@ -969,6 +970,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
std::vector<ARDOUR::framepos_t> region_boundary_cache; std::vector<ARDOUR::framepos_t> region_boundary_cache;
void build_region_boundary_cache (); void build_region_boundary_cache ();
Gtk::HBox toplevel_hpacker;
Gtk::HBox top_hbox; Gtk::HBox top_hbox;
Gtk::HBox bottom_hbox; Gtk::HBox bottom_hbox;

3
gtk2_ardour/public_editor.h
View file

@ -238,7 +238,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
virtual void export_range () = 0; virtual void export_range () = 0;
virtual void register_actions () = 0; virtual void register_actions () = 0;
virtual void add_toplevel_controls (Gtk::Container&) = 0; virtual void add_transport_frame (Gtk::Container&) = 0;
virtual void add_toplevel_menu (Gtk::Container&) = 0;
virtual void set_zoom_focus (Editing::ZoomFocus) = 0; virtual void set_zoom_focus (Editing::ZoomFocus) = 0;
virtual Editing::ZoomFocus get_zoom_focus () const = 0; virtual Editing::ZoomFocus get_zoom_focus () const = 0;
virtual framecnt_t get_current_zoom () const = 0; virtual framecnt_t get_current_zoom () const = 0;