pay some attention to the special guest of the night: KDE window stacking

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index ed81b6db2102d3cf40edd773c88a58a53cf09d89..a453b80d16c9a06679d1edd01eff271b067a0118 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -670,7 +670,7 @@ AudioClock::end_edit (bool modify)
 
                        case BBT:
                                if (is_duration) {
-                                       pos = frame_duration_from_bbt_string (0, edit_string);
+                                       pos = frame_duration_from_bbt_string (bbt_reference_time, edit_string);
                                } else {
                                        pos = frames_from_bbt_string (0, edit_string);
                                }
@@ -1003,7 +1003,7 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
                        break;
 
                case BBT:
-                       set_bbt (when, force);
+                       set_bbt (when, offset, force);
                        break;
 
                case MinSec:
@@ -1226,9 +1226,9 @@ AudioClock::set_timecode (framepos_t when, bool /*force*/)
 }
 
 void
-AudioClock::set_bbt (framepos_t when, bool /*force*/)
+AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/)
 {
-       char buf[16];
+       char buf[64];
        Timecode::BBT_Time BBT;
        bool negative = false;
 
@@ -1253,9 +1253,43 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
                        BBT.beats = 0;
                        BBT.ticks = 0;
                } else {
-                       BBT = _session->tempo_map().bbt_at_frame (when);
-                       BBT.bars--;
-                       BBT.beats--;
+                       TempoMap& tmap (_session->tempo_map());
+
+                       if (offset == 0) {
+                               offset = bbt_reference_time;
+                       }
+
+                       const double divisions = tmap.meter_section_at_frame (offset).divisions_per_bar();
+                       Timecode::BBT_Time sub_bbt;
+
+                       if (negative) {
+                               BBT = tmap.bbt_at_beat (tmap.beat_at_frame (offset));
+                               sub_bbt = tmap.bbt_at_frame (offset - when);
+                       } else {
+                               BBT = tmap.bbt_at_beat (tmap.beat_at_frame (when + offset));
+                               sub_bbt = tmap.bbt_at_frame (offset);
+                       }
+
+                       BBT.bars -= sub_bbt.bars;
+
+                       if (BBT.ticks < sub_bbt.ticks) {
+                               if (BBT.beats == 1) {
+                                       BBT.bars--;
+                                       BBT.beats = divisions;
+                               } else {
+                                       BBT.beats--;
+                               }
+                               BBT.ticks = Timecode::BBT_Time::ticks_per_beat - (sub_bbt.ticks - BBT.ticks);
+                       } else {
+                               BBT.ticks -= sub_bbt.ticks;
+                       }
+
+                       if (BBT.beats < sub_bbt.beats) {
+                               BBT.bars--;
+                               BBT.beats = divisions - (sub_bbt.beats - BBT.beats);
+                       } else {
+                               BBT.beats -= sub_bbt.beats;
+                       }
                }
        } else {
                BBT = _session->tempo_map().bbt_at_frame (when);
@@ -1282,11 +1316,12 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
 
                TempoMetric m (_session->tempo_map().metric_at (pos));
 
-               sprintf (buf, "%-5.3f", _session->tempo_map().tempo_at_frame (pos).beats_per_minute());
+               snprintf (buf, sizeof(buf), "%-5.3f/%f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute(), m.tempo().note_type());
+               /* XXX this doesn't fit inside the container. */
                _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
                                                          INFO_FONT_SIZE, buf, _("Tempo")));
 
-               sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
+               snprintf (buf, sizeof(buf), "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
                _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
                                                           INFO_FONT_SIZE, buf, _("Meter")));
        }
@@ -1732,7 +1767,7 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
        switch (ev->direction) {
 
        case GDK_SCROLL_UP:
-               frames = get_frame_step (f);
+               frames = get_frame_step (f, current_time(), 1);
                if (frames != 0) {
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                frames *= 10;
@@ -1743,7 +1778,7 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
                break;
 
        case GDK_SCROLL_DOWN:
-               frames = get_frame_step (f);
+               frames = get_frame_step (f, current_time(), -1);
                if (frames != 0) {
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                frames *= 10;