From b09938d29dbd6d307c9a867a73bd2a71e11ebd1a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 8 Jun 2011 20:38:00 +0000 Subject: [PATCH] (maybe) rationalize display of drop status for timecode in audio clocks git-svn-id: svn://localhost/ardour2/branches/3.0@9692 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_clock.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 0a7ccd4125..3adb17ab84 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -564,20 +564,11 @@ AudioClock::set_timecode (framepos_t when, bool force) if (supplemental_right) { double timecode_frames = _session->timecode_frames_per_second(); - bool drop; - - if ((fabs(timecode_frames - 29.97) < 0.0001) || timecode_frames == 30) { - if (_session->timecode_drop_frames()) { - drop = true; - } else { - drop = false; - } - } if (fmod(timecode_frames, 1.0) == 0.0) { - sprintf (buf, "%u %s", int (timecode_frames), (drop ? "D" : "")); + sprintf (buf, "%u %s", int (timecode_frames), (_session->timecode_drop_frames() ? "D" : "")); } else { - sprintf (buf, "%.2f %s", timecode_frames, (drop ? "D" : "")); + sprintf (buf, "%.2f %s", timecode_frames, (_session->timecode_drop_frames() ? "D" : "")); } supplemental_right->set_text (_text_cells[LowerRight2], buf);