Merge remote-tracking branch 'upstream/master'

[ardour.git] / gtk2_ardour / verbose_cursor.cc

diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index b24dfbc8a84780d962f3f53b3d5b2ff4442f84c8..04a91a3027339730d3acf56ae72cdfe83c475026 100644 (file)
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -44,7 +44,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
 {
        _canvas_item = new ArdourCanvas::TrackingText (_editor->get_noscroll_group());
        CANVAS_DEBUG_NAME (_canvas_item, "verbose canvas cursor");
-       _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_LargerBoldFont()));
+       _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_LargerBoldFont()));
        color_handler ();
 
        ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));
@@ -53,7 +53,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
 void
 VerboseCursor::color_handler ()
 {
-       _canvas_item->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
+       _canvas_item->set_color (ARDOUR_UI::config()->get_VerboseCanvasCursor());
 }
 
 ArdourCanvas::Item *
@@ -98,9 +98,6 @@ VerboseCursor::set_time (framepos_t frame)
        char buf[128];
        Timecode::Time timecode;
        Timecode::BBT_Time bbt;
-       int hours, mins;
-       framepos_t frame_rate;
-       float secs;
 
        if (_editor->_session == 0) {
                return;
@@ -118,18 +115,11 @@ VerboseCursor::set_time (framepos_t frame)
 
        case AudioClock::Timecode:
                _editor->_session->timecode_time (frame, timecode);
-               snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
+               snprintf (buf, sizeof (buf), "%s", Timecode::timecode_format_time (timecode).c_str());
                break;
 
        case AudioClock::MinSec:
-               /* XXX this is copied from show_verbose_duration_cursor() */
-               frame_rate = _editor->_session->frame_rate();
-               hours = frame / (frame_rate * 3600);
-               frame = frame % (frame_rate * 3600);
-               mins = frame / (frame_rate * 60);
-               frame = frame % (frame_rate * 60);
-               secs = (float) frame / (float) frame_rate;
-               snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs);
+               AudioClock::print_minsec (frame, buf, sizeof (buf), _editor->_session->frame_rate());
                break;
 
        default:
@@ -147,9 +137,6 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end)
        Timecode::Time timecode;
        Timecode::BBT_Time sbbt;
        Timecode::BBT_Time ebbt;
-       int hours, mins;
-       framepos_t distance, frame_rate;
-       float secs;
        Meter meter_at_start (_editor->_session->tempo_map().meter_at(start));
 
        if (_editor->_session == 0) {
@@ -197,19 +184,11 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end)
 
        case AudioClock::Timecode:
                _editor->_session->timecode_duration (end - start, timecode);
-               snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
+               snprintf (buf, sizeof (buf), "%s", Timecode::timecode_format_time (timecode).c_str());
                break;
 
        case AudioClock::MinSec:
-               /* XXX this stuff should be elsewhere.. */
-               distance = end - start;
-               frame_rate = _editor->_session->frame_rate();
-               hours = distance / (frame_rate * 3600);
-               distance = distance % (frame_rate * 3600);
-               mins = distance / (frame_rate * 60);
-               distance = distance % (frame_rate * 60);
-               secs = (float) distance / (float) frame_rate;
-               snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs);
+               AudioClock::print_minsec (end - start, buf, sizeof (buf), _editor->_session->frame_rate());
                break;
 
        default: