diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-01-18 01:16:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-01-18 01:16:05 +0000 |
| commit | 756ffc26bffa6a6c9276d6f4fff5b47cc54ad35a (patch) | |
| tree | 46580ef67f13b42795179f446ef4266e7d5b061b /gtk2_ardour/editor.h | |
| parent | 64d82d9a8eee69ab19ac43e6596ae9693bd0ce4d (diff) | |
Tidy up the ruler code slightly.
git-svn-id: svn://localhost/ardour2/branches/3.0@8528 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 62dc640999..a54340ea7c 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -760,7 +760,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD static GtkCustomMetric ruler_metrics[4]; Glib::RefPtr<Gtk::ToggleAction> ruler_timecode_action; Glib::RefPtr<Gtk::ToggleAction> ruler_bbt_action; - Glib::RefPtr<Gtk::ToggleAction> ruler_samples_action; + Glib::RefPtr<Gtk::ToggleAction> ruler_frames_action; Glib::RefPtr<Gtk::ToggleAction> ruler_minsec_action; Glib::RefPtr<Gtk::ToggleAction> ruler_tempo_action; Glib::RefPtr<Gtk::ToggleAction> ruler_meter_action; @@ -808,7 +808,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD framecnt_t minsec_mark_interval; gint minsec_mark_modulo; gint minsec_nmarks; - void set_minsec_ruler_scale (gdouble lower, gdouble upper); + void set_minsec_ruler_scale (framepos_t, framepos_t); enum TimecodeRulerScale { timecode_show_bits, @@ -820,10 +820,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD TimecodeRulerScale timecode_ruler_scale; - framecnt_t timecode_mark_interval; gint timecode_mark_modulo; gint timecode_nmarks; - void set_timecode_ruler_scale (gdouble lower, gdouble upper); + void set_timecode_ruler_scale (framepos_t, framepos_t); framecnt_t _frames_ruler_interval; void set_frames_ruler_scale (framepos_t, framepos_t); |