From 43d2aeab612022228eb9357bfa7e8bb88809c64f Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Fri, 5 Mar 2010 10:52:55 +1000 Subject: QuickTime movie view output: emit the natural size changes Reviewed-by: Justin McPherson --- src/plugins/mediaservices/qt7/qt7movieviewoutput.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm index b90470c..d8d48d0 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm @@ -201,7 +201,10 @@ void QT7MovieViewOutput::setMovie(void *movie) void QT7MovieViewOutput::updateNaturalSize(const QSize &newSize) { - m_nativeSize = newSize; + if (m_nativeSize != newSize) { + m_nativeSize = newSize; + emit nativeSizeChanged(); + } } WId QT7MovieViewOutput::winId() const -- cgit v0.12 From c4cc1998b42b61f6389c372dcb572f2e5d5dcc08 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Fri, 5 Mar 2010 11:47:30 +1000 Subject: Fixed compiler warning Reviewed-by: Justin McPherson --- src/plugins/mediaservices/qt7/qt7movieviewoutput.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm index d8d48d0..254af46 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm @@ -60,6 +60,7 @@ - (TransparentQTMovieView *) init; - (void) setDrawRect:(QRect &)rect; +- (CIImage *) view:(QTMovieView *)view willDisplayImage:(CIImage *)img; - (void) setContrast:(qreal) contrast; @end -- cgit v0.12 From 5278c12ff3c6d8e467fe4034120e258fdaa90b80 Mon Sep 17 00:00:00 2001 From: Justin McPherson Date: Fri, 5 Mar 2010 11:48:55 +1000 Subject: Fix spelling in enumeration. Reviewed-by: Dmytro Poplavskiy --- src/multimedia/base/qmediaserviceprovider.cpp | 4 ++-- src/multimedia/base/qtmedianamespace.h | 2 +- src/multimedia/base/qtmedianamespace.qdoc | 2 +- tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 6e11079..b089b39 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -350,7 +350,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMultimedia::PreferedService) + if (currentEstimate == QtMultimedia::PreferredService) break; } } @@ -426,7 +426,7 @@ public: allServicesProvideInterface = false; } - //don't return PreferedService + //don't return PreferredService supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported); //Return NotSupported only if no services are available of serviceType diff --git a/src/multimedia/base/qtmedianamespace.h b/src/multimedia/base/qtmedianamespace.h index 2a56fc3..fe20a05 100644 --- a/src/multimedia/base/qtmedianamespace.h +++ b/src/multimedia/base/qtmedianamespace.h @@ -152,7 +152,7 @@ namespace QtMultimedia NotSupported, MaybeSupported, ProbablySupported, - PreferedService + PreferredService }; enum EncodingQuality diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/base/qtmedianamespace.qdoc index 270c7d6..58e9c92 100644 --- a/src/multimedia/base/qtmedianamespace.qdoc +++ b/src/multimedia/base/qtmedianamespace.qdoc @@ -172,7 +172,7 @@ \value NotSupported The feature is not supported. \value MaybeSupported The feature may be supported. \value ProbablySupported The feature is probably supported. - \value PreferedService The service is the preferred provider of a service. + \value PreferredService The service is the preferred provider of a service. */ /*! diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index d839fe5..06a8f60 100644 --- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -152,7 +152,7 @@ public: Q_UNUSED(codecs); if (mimeType == "audio/wav") - return QtMultimedia::PreferedService; + return QtMultimedia::PreferredService; return QtMultimedia::NotSupported; } -- cgit v0.12