diff options
Diffstat (limited to 'src/plugins/mediaservices/qt7')
4 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.h b/src/plugins/mediaservices/qt7/qt7movievideowidget.h index 558c3d7..7908efd 100644 --- a/src/plugins/mediaservices/qt7/qt7movievideowidget.h +++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.h @@ -83,8 +83,8 @@ public: QSize nativeSize() const; - QVideoWidget::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(QVideoWidget::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const; + void setAspectRatioMode(Qt::AspectRatioMode mode); int brightness() const; void setBrightness(int brightness); @@ -118,7 +118,7 @@ private: bool m_fullscreen; QSize m_nativeSize; - QVideoWidget::AspectRatioMode m_aspectRatioMode; + Qt::AspectRatioMode m_aspectRatioMode; int m_brightness; int m_contrast; int m_hue; diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm index 00ceffc..197c26e 100644 --- a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm +++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm @@ -66,7 +66,7 @@ public: : QGLWidget(format, parent), m_texRef(0), m_nativeSize(640,480), - m_aspectRatioMode(QVideoWidget::KeepAspectRatio) + m_aspectRatioMode(Qt::KeepAspectRatio) { setAutoFillBackground(false); } @@ -145,7 +145,7 @@ public: m_nativeSize = size; } - void setAspectRatioMode(QVideoWidget::AspectRatioMode mode) + void setAspectRatioMode(Qt::AspectRatioMode mode) { if (m_aspectRatioMode != mode) { m_aspectRatioMode = mode; @@ -158,7 +158,7 @@ private: { QRect displayRect = rect(); - if (m_aspectRatioMode == QVideoWidget::KeepAspectRatio) { + if (m_aspectRatioMode == Qt::KeepAspectRatio) { QSize size = m_nativeSize; size.scale(displayRect.size(), Qt::KeepAspectRatio); @@ -170,7 +170,7 @@ private: CVOpenGLTextureRef m_texRef; QSize m_nativeSize; - QVideoWidget::AspectRatioMode m_aspectRatioMode; + Qt::AspectRatioMode m_aspectRatioMode; }; QT7MovieVideoWidget::QT7MovieVideoWidget(QObject *parent) @@ -178,7 +178,7 @@ QT7MovieVideoWidget::QT7MovieVideoWidget(QObject *parent) m_movie(0), m_videoWidget(0), m_fullscreen(false), - m_aspectRatioMode(QVideoWidget::KeepAspectRatio), + m_aspectRatioMode(Qt::KeepAspectRatio), m_brightness(0), m_contrast(0), m_hue(0), @@ -324,12 +324,12 @@ QSize QT7MovieVideoWidget::nativeSize() const return m_nativeSize; } -QVideoWidget::AspectRatioMode QT7MovieVideoWidget::aspectRatioMode() const +Qt::AspectRatioMode QT7MovieVideoWidget::aspectRatioMode() const { return m_aspectRatioMode; } -void QT7MovieVideoWidget::setAspectRatioMode(QVideoWidget::AspectRatioMode mode) +void QT7MovieVideoWidget::setAspectRatioMode(Qt::AspectRatioMode mode) { m_aspectRatioMode = mode; m_videoWidget->setAspectRatioMode(mode); diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h index 3ac409e..49049ad 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h @@ -80,8 +80,8 @@ public: QSize nativeSize() const; - QVideoWidget::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(QVideoWidget::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const; + void setAspectRatioMode(Qt::AspectRatioMode mode); int brightness() const; void setBrightness(int brightness); @@ -106,7 +106,7 @@ private: QRect m_displayRect; bool m_fullscreen; QSize m_nativeSize; - QVideoWidget::AspectRatioMode m_aspectRatioMode; + Qt::AspectRatioMode m_aspectRatioMode; int m_brightness; int m_contrast; int m_hue; diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm index d5f4f95..8e4dd9b 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm @@ -157,7 +157,7 @@ QT7MovieViewOutput::QT7MovieViewOutput(QObject *parent) m_layouted(false), m_winId(0), m_fullscreen(false), - m_aspectRatioMode(QVideoWidget::KeepAspectRatio), + m_aspectRatioMode(Qt::KeepAspectRatio), m_brightness(0), m_contrast(0), m_hue(0), @@ -254,7 +254,7 @@ void QT7MovieViewOutput::setDisplayRect(const QRect &rect) if (m_movieView) { AutoReleasePool pool; - [(QTMovieView*)m_movieView setPreservesAspectRatio:(m_aspectRatioMode == QVideoWidget::KeepAspectRatio ? YES : NO)]; + [(QTMovieView*)m_movieView setPreservesAspectRatio:(m_aspectRatioMode == Qt::KeepAspectRatio ? YES : NO)]; [(QTMovieView*)m_movieView setFrame:NSMakeRect(m_displayRect.x(), m_displayRect.y(), m_displayRect.width(), @@ -283,12 +283,12 @@ QSize QT7MovieViewOutput::nativeSize() const return m_nativeSize; } -QVideoWidget::AspectRatioMode QT7MovieViewOutput::aspectRatioMode() const +Qt::AspectRatioMode QT7MovieViewOutput::aspectRatioMode() const { return m_aspectRatioMode; } -void QT7MovieViewOutput::setAspectRatioMode(QVideoWidget::AspectRatioMode mode) +void QT7MovieViewOutput::setAspectRatioMode(Qt::AspectRatioMode mode) { m_aspectRatioMode = mode; setDisplayRect(m_displayRect); |