remove some 1920 tick constants and leave notes for some others.

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index b0cc6eeea378610ab9fda5af2bff01cb607c4654..670083e0d482a917365101ab7d74eba8320a2f38 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -537,7 +537,8 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e)
 
                        const framepos_t pos = e.pixel_to_sample(before_x);
                        const Meter& meter = map.meter_at (pos);
-                       const framecnt_t len = ceil(meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) / 1920.0 / meter.divisions_per_bar());
+                       const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate())
+                                       / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()) );
                        const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len);
 
                        before_x += one_tick_in_pixels;
@@ -552,7 +553,8 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e)
 
                        const framepos_t pos = e.pixel_to_sample(after_x);
                        const Meter& meter = map.meter_at (pos);
-                       const framecnt_t len = ceil(meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) / 1920.0 / meter.divisions_per_bar());
+                       const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate())
+                                       / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()));
                        const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len);
 
                        after_x -= one_tick_in_pixels;

diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc
index 623a5d8033511bc60183afe5af6333c5e12fb23a..98514326d5e9b6ef7c7a7ea081ef4a8a930876ac 100644 (file)
--- a/gtk2_ardour/quantize_dialog.cc
+++ b/gtk2_ardour/quantize_dialog.cc
@@ -57,7 +57,7 @@ QuantizeDialog::QuantizeDialog (PublicEditor& e)
        , swing_adjustment (100.0, -130.0, 130.0, 1.0, 10.0)
        , swing_spinner (swing_adjustment)
        , swing_button (_("Swing"))
-       , threshold_adjustment (0.0, -1920.0, 1920.0, 1.0, 10.0) // XXX MAGIC TICK NUMBER FIX ME
+       , threshold_adjustment (0.0, -Timecode::BBT_Time::ticks_per_beat, Timecode::BBT_Time::ticks_per_beat, 1.0, 10.0)
        , threshold_spinner (threshold_adjustment)
        , threshold_label (_("Threshold (ticks)"))
        , snap_start_button (_("Snap note start"))

diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index fe81b8f0441e8efd348830da98e678b6b1d4557a..5b04e277b95d9affc2c16005a9bda506f18c5a22 100644 (file)
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -54,6 +54,7 @@ public:
 
        static bool test(const std::string& path);
        int  open(const std::string& path, int track=1) THROW_FILE_ERROR;
+       // XXX 19200 = 10 * Timecode::BBT_Time::ticks_per_beat
        int  create(const std::string& path, int track=1, uint16_t ppqn=19200) THROW_FILE_ERROR;
        void close() THROW_FILE_ERROR;
 

diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp
index 7259a5c0debce0995a9350cfa430814d6c0a46af..b642fba4c266cd7f1fdb96733f92979c1cc16c1f 100644 (file)
--- a/libs/evoral/evoral/types.hpp
+++ b/libs/evoral/evoral/types.hpp
@@ -42,7 +42,8 @@ const MusicalTime MaxMusicalTime = DBL_MAX;
 const MusicalTime MinMusicalTime = DBL_MIN;
 
 static inline bool musical_time_equal (MusicalTime a, MusicalTime b) {
-       /* acceptable tolerance is 1 tick. Nice if there was no magic number here */
+       /* acceptable tolerance is 1 tick. Nice if there was no magic number here
+        * -> Timecode::BBT_Time::ticks_per_beat */
        return fabs (a - b) <= (1.0/1920.0);
 }