From a117960480c42b9c89565d104013f040154d4130 Mon Sep 17 00:00:00 2001 From: nick_m Date: Tue, 5 Apr 2016 03:56:38 +1000 Subject: Tempo ramps - first tempo and meter are always audio locked wrt gui. - fixes some gtk warnings as well --- gtk2_ardour/tempo_dialog.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 3a47b36994..7f79cf3354 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -196,17 +196,19 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, Label* when_label = manage (new Label(_("Tempo begins at"), ALIGN_LEFT, ALIGN_CENTER)); table->attach (*when_label, 0, 1, row, row+1); + + ++row; + + Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_LEFT, ALIGN_CENTER)); + table->attach (*lock_style_label, 0, 1, row, row + 1); + table->attach (lock_style, 1, 2, row, row + 1); + + ++row; } Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*tempo_type_label, 0, 1, row+1, row+2); - table->attach (tempo_type, 1, 2, row+1, row + 2); - get_vbox()->set_border_width (12); - get_vbox()->pack_end (*table); - - Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*lock_style_label, 0, 1, row+2, row+3); - table->attach (lock_style, 1, 2, row+2, row + 3); + table->attach (*tempo_type_label, 0, 1, row, row + 1); + table->attach (tempo_type, 1, 2, row, row + 2); get_vbox()->set_border_width (12); get_vbox()->pack_end (*table); @@ -514,9 +516,6 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b table->attach (*lock_label, 0, 1, 3, 4, FILL|EXPAND, FILL|EXPAND); table->attach (lock_style, 1, 2, 3, 4, FILL|EXPAND, SHRINK); - } else { - table->attach (*lock_label, 0, 1, 2, 3, FILL|EXPAND, FILL|EXPAND); - table->attach (lock_style, 1, 2, 2, 3, FILL|EXPAND, SHRINK); } get_vbox()->set_border_width (12); -- cgit v1.2.3