change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample

[ardour.git] / gtk2_ardour / editor_videotimeline.cc

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index a4a0b1b2109a25a16b33a229dfb9468cd529d38f..574400c2d9f16e5291aafb858ff147c723f1e86c 100644 (file)
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -17,7 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
 
 #include <jack/types.h>
 
@@ -59,8 +58,8 @@ Editor::update_video_timeline (bool flush)
 #if DEBUG
        framepos_t rightmost_frame = leftmost_frame + current_page_frames();
        std::cout << "VIDEO SCROLL: " << leftmost_frame << " -- " << rightmost_frame << std::endl;
-       std::cout << "SCROLL UNITS: " << frame_to_unit(leftmost_frame) << " -- " << frame_to_unit(rightmost_frame)
-                 << " = " << frame_to_unit(rightmost_frame) - frame_to_unit(leftmost_frame)
+       std::cout << "SCROLL UNITS: " << sample_to_pixel(leftmost_frame) << " -- " << sample_to_pixel(rightmost_frame)
+                 << " = " << sample_to_pixel(rightmost_frame) - sample_to_pixel(leftmost_frame)
                        << std::endl;
 #endif
 
@@ -139,5 +138,3 @@ Editor::export_video ()
        }
 #endif
 }
-
-#endif /* WITH_VIDEOTIMELINE */