followup to the previous tempo-dragging commit: use argument to Drag::aborted() to...

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 757d5bc846c727c2128b88e407e2c228ae4230a1..7d37f9cea8c9fc2234ac2b8db89bd9c40bdee1a1 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1171,7 +1171,7 @@ AudioClock::set_bbt (framepos_t when, bool force)
                sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
                _left_layout->set_text (buf);
 
-               sprintf (buf, "%g/%g", m.meter().beats_per_bar(), m.meter().note_divisor());
+               sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
                _right_layout->set_text (buf);
        }
 }
@@ -1779,7 +1779,7 @@ AudioClock::bbt_validate_edit (const string& str)
                return false;
        }
 
-       if (any.bbt.ticks > Timecode::BBT_Time::ticks_per_beat) {
+       if (any.bbt.ticks > Timecode::BBT_Time::ticks_per_bar_division) {
                return false;
        }