Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / verbose_cursor.cc

diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index aac476408d436d4f925eb2d6482c8e2840405e11..d316a15984e94be8c991887e3634952b07f329dc 100644 (file)
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -34,7 +34,7 @@
 #include "ardour_ui.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -93,7 +93,7 @@ VerboseCursor::set_offset (ArdourCanvas::Duple const & d)
 }
 
 void
-VerboseCursor::set_time (framepos_t frame)
+VerboseCursor::set_time (samplepos_t sample)
 {
        char buf[128];
        Timecode::Time timecode;
@@ -109,21 +109,25 @@ VerboseCursor::set_time (framepos_t frame)
 
        switch (m) {
        case AudioClock::BBT:
-               _editor->_session->bbt_time (frame, bbt);
+               _editor->_session->bbt_time (sample, bbt);
                snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, bbt.bars, bbt.beats, bbt.ticks);
                break;
 
        case AudioClock::Timecode:
-               _editor->_session->timecode_time (frame, timecode);
+               _editor->_session->timecode_time (sample, timecode);
                snprintf (buf, sizeof (buf), "%s", Timecode::timecode_format_time (timecode).c_str());
                break;
 
        case AudioClock::MinSec:
-               AudioClock::print_minsec (frame, buf, sizeof (buf), _editor->_session->frame_rate());
+               AudioClock::print_minsec (sample, buf, sizeof (buf), _editor->_session->sample_rate());
+               break;
+
+       case AudioClock::Seconds:
+               snprintf (buf, sizeof(buf), "%.1f", sample / (float)_editor->_session->sample_rate());
                break;
 
        default:
-               snprintf (buf, sizeof(buf), "%" PRIi64, frame);
+               snprintf (buf, sizeof(buf), "%" PRIi64, sample);
                break;
        }
 
@@ -131,13 +135,13 @@ VerboseCursor::set_time (framepos_t frame)
 }
 
 void
-VerboseCursor::set_duration (framepos_t start, framepos_t end)
+VerboseCursor::set_duration (samplepos_t start, samplepos_t end)
 {
        char buf[128];
        Timecode::Time timecode;
        Timecode::BBT_Time sbbt;
        Timecode::BBT_Time ebbt;
-       Meter meter_at_start (_editor->_session->tempo_map().meter_at_frame (start));
+       Meter meter_at_start (_editor->_session->tempo_map().meter_at_sample (start));
 
        if (_editor->_session == 0) {
                return;
@@ -188,7 +192,11 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end)
                break;
 
        case AudioClock::MinSec:
-               AudioClock::print_minsec (end - start, buf, sizeof (buf), _editor->_session->frame_rate());
+               AudioClock::print_minsec (end - start, buf, sizeof (buf), _editor->_session->sample_rate());
+               break;
+
+       case AudioClock::Seconds:
+               snprintf (buf, sizeof(buf), "%.1f", (end - start) / (float)_editor->_session->sample_rate());
                break;
 
        default: