globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / gtk2_ardour / mini_timeline.h

diff --git a/gtk2_ardour/mini_timeline.h b/gtk2_ardour/mini_timeline.h
index 1dd1a527b7db0bfdf5d5034fa36d910d5820dfea..21b316df396ff8b53bd26b2e4095d905f531e0dc 100644 (file)
--- a/gtk2_ardour/mini_timeline.h
+++ b/gtk2_ardour/mini_timeline.h
@@ -69,7 +69,7 @@ private:
        int  draw_edge (cairo_t*, int x0, int x1, bool left, const std::string&, bool& prelight);
 
        void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
-       void format_time (framepos_t when);
+       void format_time (samplepos_t when);
 
        bool on_button_press_event (GdkEventButton*);
        bool on_button_release_event (GdkEventButton*);
@@ -78,22 +78,22 @@ private:
        bool on_leave_notify_event (GdkEventCrossing*);
 
        void build_minitl_context_menu ();
-       void set_span (ARDOUR::framecnt_t);
+       void set_span (ARDOUR::samplecnt_t);
 
        Glib::RefPtr<Pango::Layout> _layout;
        sigc::connection super_rapid_connection;
        PBD::ScopedConnectionList marker_connection;
        PBD::ScopedConnectionList session_connection;
 
-       framepos_t _last_update_frame;
+       samplepos_t _last_update_sample;
        AudioClock::Mode _clock_mode;
        int _time_width;
        int _time_height;
 
        int _n_labels;
        double _px_per_sample;
-       ARDOUR::framecnt_t _time_granularity;
-       ARDOUR::framecnt_t _time_span_samples;
+       ARDOUR::samplecnt_t _time_granularity;
+       ARDOUR::samplecnt_t _time_span_samples;
        int _marker_height;
 
        int _pointer_x;
@@ -102,11 +102,11 @@ private:
        Gtk::Menu* _minitl_context_menu;
 
        struct JumpRange {
-               JumpRange (int l, int r, framepos_t t, bool p = false)
+               JumpRange (int l, int r, samplepos_t t, bool p = false)
                        : left (l), right (r), to (t), prelight (p) {}
                int left;
                int right;
-               framepos_t to;
+               samplepos_t to;
                bool prelight;
        };