diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-12 11:15:45 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-12 11:15:45 -0400 |
| commit | 4258a349121392516543486bd9de6f13fe3f3331 (patch) | |
| tree | 3cd0c6b61a58e006483d0782326b43246d9eb55e /gtk2_ardour/editor_markers.cc | |
| parent | ecfd2a74552a45781e4d57a09e73313cd8815a4d (diff) | |
change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 2a88fd1bfc..7a774aaeba 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -259,7 +259,7 @@ Editor::check_marker_label (Marker* m) /* Update just the available space between the previous marker and this one */ - double const p = frame_to_pixel (m->position() - (*prev)->position()); + double const p = sample_to_pixel (m->position() - (*prev)->position()); if (m->label_on_left()) { (*prev)->set_right_label_limit (p / 2); @@ -278,7 +278,7 @@ Editor::check_marker_label (Marker* m) /* Update just the available space between this marker and the next */ - double const p = frame_to_pixel ((*next)->position() - m->position()); + double const p = sample_to_pixel ((*next)->position() - m->position()); if ((*next)->label_on_left()) { m->set_right_label_limit (p / 2); @@ -332,7 +332,7 @@ Editor::update_marker_labels (ArdourCanvas::Group* group) while (i != sorted.end()) { if (prev != sorted.end()) { - double const p = frame_to_pixel ((*i)->position() - (*prev)->position()); + double const p = sample_to_pixel ((*i)->position() - (*prev)->position()); if ((*prev)->label_on_left()) { (*i)->set_left_label_limit (p); @@ -343,7 +343,7 @@ Editor::update_marker_labels (ArdourCanvas::Group* group) } if (next != sorted.end()) { - double const p = frame_to_pixel ((*next)->position() - (*i)->position()); + double const p = sample_to_pixel ((*next)->position() - (*i)->position()); if ((*next)->label_on_left()) { (*i)->set_right_label_limit (p / 2); @@ -1419,8 +1419,8 @@ Editor::update_loop_range_view (bool visibility) if (_session->get_play_loop() && ((tll = transport_loop_location()) != 0)) { - double x1 = frame_to_pixel (tll->start()); - double x2 = frame_to_pixel (tll->end()); + double x1 = sample_to_pixel (tll->start()); + double x2 = sample_to_pixel (tll->end()); transport_loop_range_rect->set_x0 (x1); transport_loop_range_rect->set_x1 (x2); @@ -1446,11 +1446,11 @@ Editor::update_punch_range_view (bool visibility) if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) { ArdourCanvas::Rect const v = _track_canvas_viewport->visible_area (); if (_session->config.get_punch_in()) { - transport_punch_range_rect->set_x0 (frame_to_pixel (tpl->start())); - transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES)); + transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start())); + transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES)); } else { transport_punch_range_rect->set_x0 (0); - transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : v.width ()); + transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ()); } if (visibility) { |