diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
| commit | 3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2 (patch) | |
| tree | 314c3099bcc57d9af09d249e1e7dd8e45baca642 /gtk2_ardour/audio_clock.cc | |
| parent | d15fda6d751a465d278f477923075d4783f3b1ca (diff) | |
| parent | 897fbdc652434d3aa1e67223c3c3ef7ae9be2318 (diff) | |
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index b24d22f1b9..7bbc00c267 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1131,7 +1131,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) { @@ -1742,7 +1742,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; |