diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-19 01:53:39 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-19 01:53:39 +0000 |
commit | ed9bdd08945def40da97448af36301452b1b01df (patch) | |
tree | 27bf90fb296cde7cd12920657cd2f3f05d71b3f1 /gtk2_ardour/ardour_ui2.cc | |
parent | 86f7d4ef8735134fcb2a0abd065381370d028ab1 (diff) |
a ton of changes based on discussions at SAE; to be documented later
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2694 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 190b7a2fff..17a9153797 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -315,6 +315,7 @@ ARDOUR_UI::setup_transport () primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); + big_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); ARDOUR_UI::instance()->tooltips().set_tip (primary_clock, _("Primary clock")); ARDOUR_UI::instance()->tooltips().set_tip (secondary_clock, _("secondary clock")); @@ -407,12 +408,16 @@ ARDOUR_UI::setup_transport () if (!ARDOUR::Profile->get_small_screen()) { clock_box->pack_start (secondary_clock, false, false); } - VBox* time_controls_box = manage (new VBox); - time_controls_box->pack_start (sync_option_combo, false, false); - time_controls_box->pack_start (time_master_button, false, false); - clock_box->pack_start (*time_controls_box, false, false, 1); + + if (!Profile->get_sae()) { + VBox* time_controls_box = manage (new VBox); + time_controls_box->pack_start (sync_option_combo, false, false); + time_controls_box->pack_start (time_master_button, false, false); + clock_box->pack_start (*time_controls_box, false, false, 1); + } + transport_tearoff_hbox.pack_start (*clock_box, false, false, 0); - + HBox* toggle_box = manage(new HBox); VBox* punch_box = manage (new VBox); |