# HG changeset patch
# User Chris Cannam
# Date 1537440311 -3600
# Node ID 8f9e9cff141d3a7219aeabf9e93f198835a28f28
# Parent  53073777e591124787b6be6c449abc896d09b834
Use frame type

diff -r 53073777e591 -r 8f9e9cff141d base/ZoomLevel.h
--- a/base/ZoomLevel.h	Thu Sep 20 10:45:48 2018 +0100
+++ b/base/ZoomLevel.h	Thu Sep 20 11:45:11 2018 +0100
@@ -15,6 +15,8 @@
 #ifndef SV_ZOOM_LEVEL_H
 #define SV_ZOOM_LEVEL_H
 
+#include "BaseTypes.h"
+
 #include <ostream>
 #include <cmath>
 
@@ -103,11 +105,11 @@
     /** Return a ZoomLevel that approximates the given ratio of pixels
      *  to frames.
      */
-    static ZoomLevel fromRatio(int pixels, int frames) {
+    static ZoomLevel fromRatio(int pixels, sv_frame_t frames) {
         if (pixels < frames) {
-            return { FramesPerPixel, int(round(double(pixels)/frames)) };
+            return { FramesPerPixel, int(round(double(frames)/pixels)) };
         } else {
-            int r = int(round(double(frames)/pixels));
+            int r = int(round(pixels/double(frames)));
             if (r > 1) {
                 return { PixelsPerFrame, r };
             } else {