diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
commit | 19bb2b33a89a1291451f0740739a36daebe00bae (patch) | |
tree | d0cafb4792ec4ff61d04d16c1e86199b2714a36f /libs/ardour/ltc_slave.cc | |
parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
parent | fd23ebd0886cd61f8ee68d52d6576d00a16c9032 (diff) |
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
Diffstat (limited to 'libs/ardour/ltc_slave.cc')
-rw-r--r-- | libs/ardour/ltc_slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 2888e7c114..ced0226d00 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -588,7 +588,7 @@ LTC_Slave::approximate_current_delta() const if (last_timestamp == 0 || engine_dll_initstate == 0) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) { - snprintf(delta, sizeof(delta), _("flywheel")); + snprintf(delta, sizeof(delta), "%s", _("flywheel")); } else { snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span>sm", LEADINGZERO(llabs(current_delta)), PLUSMINUS(-current_delta), llabs(current_delta)); |