summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mini_timeline.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
commit30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch)
tree620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /gtk2_ardour/mini_timeline.h
parentcb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff)
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
Diffstat (limited to 'gtk2_ardour/mini_timeline.h')
-rw-r--r--gtk2_ardour/mini_timeline.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/mini_timeline.h b/gtk2_ardour/mini_timeline.h
index 1dd1a527b7..21b316df39 100644
--- 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;
};