Change the frame rate property to a qreal from a QPair<int,int> rational

While a rational number is a common way to represent a frame rate,
QPair<int, int> isn't a proper numeric type meaning it can't be used as
anything more than an identifer for an exact frame rate without being
converted to a real, or extending it to a proper rational type.

Rev by: Justin McPherson

1 files changed, 2 insertions, 6 deletions

diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h
index b3005bd..1f4a5cb 100644
--- a/src/multimedia/video/qvideosurfaceformat.h
+++ b/src/multimedia/video/qvideosurfaceformat.h
@@ -87,8 +87,6 @@ public:
 #endif
     };
 
-    typedef QPair<int, int> FrameRate;
-
     QVideoSurfaceFormat();
     QVideoSurfaceFormat(
             const QSize &size,
@@ -120,9 +118,8 @@ public:
     Direction scanLineDirection() const;
     void setScanLineDirection(Direction direction);
 
-    FrameRate frameRate() const;
-    void setFrameRate(const FrameRate &rate);
-    void setFrameRate(int numerator, int denominator = 1);
+    qreal frameRate() const;
+    void setFrameRate(qreal rate);
 
     QSize pixelAspectRatio() const;
     void setPixelAspectRatio(const QSize &ratio);
@@ -147,7 +144,6 @@ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QVideoSurfaceFormat &);
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QVideoSurfaceFormat::FrameRate)
 Q_DECLARE_METATYPE(QVideoSurfaceFormat::Direction)
 Q_DECLARE_METATYPE(QVideoSurfaceFormat::YuvColorSpace)