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

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 0b52d144db7b3ae7848b49c1e2a85482481b4d43..b578939f7a31861fecf812de7409de0f824cf4b0 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -64,7 +64,7 @@ void ArdourMarker::setup_sizes(const double timebar_height)
 }
 
 ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation,
-               Type type, framepos_t frame, bool handle_events)
+               Type type, samplepos_t sample, bool handle_events)
 
        : editor (ed)
        , _parent (&parent)
@@ -255,8 +255,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
 
        }
 
-       frame_position = frame;
-       unit_position = editor.sample_to_pixel (frame);
+       sample_position = sample;
+       unit_position = editor.sample_to_pixel (sample);
        unit_position -= _shift;
 
        group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 1));
@@ -460,18 +460,18 @@ ArdourMarker::setup_name_display ()
 }
 
 void
-ArdourMarker::set_position (framepos_t frame)
+ArdourMarker::set_position (samplepos_t sample)
 {
-       unit_position = editor.sample_to_pixel (frame) - _shift;
+       unit_position = editor.sample_to_pixel (sample) - _shift;
        group->set_x_position (unit_position);
        setup_line ();
-       frame_position = frame;
+       sample_position = sample;
 }
 
 void
 ArdourMarker::reposition ()
 {
-       set_position (frame_position);
+       set_position (sample_position);
 }
 
 void
@@ -550,7 +550,7 @@ ArdourMarker::set_right_label_limit (double p)
 
 TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
                          ARDOUR::TempoSection& temp)
-       : ArdourMarker (editor, parent, rgba, text, Tempo, temp.frame(), false),
+       : ArdourMarker (editor, parent, rgba, text, Tempo, temp.sample(), false),
          _tempo (temp)
 {
        group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), group, this));
@@ -584,7 +584,7 @@ TempoMarker::update_height_mark (const double ratio)
 
 MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
                          ARDOUR::MeterSection& m)
-       : ArdourMarker (editor, parent, rgba, text, Meter, m.frame(), false),
+       : ArdourMarker (editor, parent, rgba, text, Meter, m.sample(), false),
          _meter (m)
 {
        group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), group, this));