diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-24 23:49:10 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-24 23:49:10 (GMT) |
| commit | 0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4 (patch) | |
| tree | f1c8379b25df379fda62cd3069df8e70b3ff86d7 /src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm | |
| parent | f39bb2af2d81640d30222cd5abc31b076105dd8b (diff) | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| download | Qt-0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4.zip Qt-0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4.tar.gz Qt-0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4.tar.bz2 | |
Merge branch 'master' of ../../qt/master
Conflicts:
src/multimedia/qml/qml.pri
src/multimedia/qml/qmlaudio_p.h
src/multimedia/qml/qmlgraphicsvideo_p.h
src/multimedia/qml/qmlmediabase_p.h
src/plugins/qmlmodules/multimedia/multimedia.cpp
Diffstat (limited to 'src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm')
| -rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm index df15fa8..faf75d1 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm @@ -79,7 +79,7 @@ QT7PlayerService::QT7PlayerService(QObject *parent): #if defined(QT_MAC_USE_COCOA) m_videoWidnowControl = new QT7MovieViewOutput(this); m_videoOutputControl->enableOutput(QVideoOutputControl::WindowOutput); - qDebug() << "Using cocoa"; +// qDebug() << "Using cocoa"; #endif #ifdef QUICKTIME_C_API_AVAILABLE @@ -88,11 +88,11 @@ QT7PlayerService::QT7PlayerService(QObject *parent): m_videoWidgetControl = new QT7MovieVideoWidget(this); m_videoOutputControl->enableOutput(QVideoOutputControl::WidgetOutput); - qDebug() << "QuickTime C API is available"; +// qDebug() << "QuickTime C API is available"; #else m_videoRendererControl = new QT7MovieViewRenderer(this); m_videoOutputControl->enableOutput(QVideoOutputControl::RendererOutput); - qDebug() << "QuickTime C API is not available"; +// qDebug() << "QuickTime C API is not available"; #endif @@ -129,7 +129,7 @@ QMediaControl *QT7PlayerService::control(const char *name) const void QT7PlayerService::updateVideoOutput() { - qDebug() << "QT7PlayerService::updateVideoOutput" << m_videoOutputControl->output(); +// qDebug() << "QT7PlayerService::updateVideoOutput" << m_videoOutputControl->output(); switch (m_videoOutputControl->output()) { case QVideoOutputControl::WindowOutput: |