X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_clock.cc;h=0c7f41f6ebe699b4b48d43a9a631df8ef0753119;hb=9f4a00fa898845ba177955f115fa2f96d62a8643;hp=c658160e146df3c1c5d1c91681ae84844f8e310a;hpb=6a436fd826d1c9d88b60287696cc0836ccce35aa;p=ardour.git

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index c658160e14..0c7f41f6eb 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -45,6 +45,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace std;
@@ -282,7 +283,7 @@ AudioClock::set_colors ()
 }
 
 void
-AudioClock::render (cairo_t* cr)
+AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
 {
 	/* main layout: rounded rect, plus the text */
 
@@ -620,6 +621,9 @@ AudioClock::end_edit (bool modify)
 			break;
 
 		case Frames:
+			if (edit_string.length() < 1) {
+				edit_string = pre_edit_string;
+			}
 			break;
 		}
 
@@ -996,7 +1000,7 @@ AudioClock::set_slave_info ()
 		Slave* slave = _session->slave();
 
 		switch (sync_src) {
-		case JACK:
+		case Engine:
 			_left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
 						INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
 			_right_layout->set_text ("");
@@ -1128,7 +1132,7 @@ AudioClock::set_minsec (framepos_t when, bool /*force*/)
 	mins = (int) floor (left / (_session->frame_rate() * 60.0f));
 	left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f);
 	secs = (int) floor (left / (float) _session->frame_rate());
-	left -= (framecnt_t) floor (secs * _session->frame_rate());
+	left -= (framecnt_t) floor ((double)(secs * _session->frame_rate()));
 	millisecs = floor (left * 1000.0 / (float) _session->frame_rate());
 
 	if (negative) {
@@ -1739,7 +1743,7 @@ AudioClock::on_motion_notify_event (GdkEventMotion *ev)
 
 	drag_y = ev->y;
 
-	if (trunc (drag_accum) != 0) {
+	if (floor (drag_accum) != 0) {
 
 		framepos_t frames;
 		framepos_t pos;