(maybe) rationalize display of drop status for timecode in audio clocks
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 8 Jun 2011 20:38:00 +0000 (20:38 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 8 Jun 2011 20:38:00 +0000 (20:38 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@9692 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/audio_clock.cc

index 0a7ccd412591561fe86ecea564d4328dd1150842..3adb17ab846982f60a6e44604749602c4ae9c5b7 100644 (file)
@@ -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);