diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-19 03:54:25 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-19 03:54:25 (GMT) |
commit | 65bca1935008012d096872647dc02c124abcab75 (patch) | |
tree | 77373a7d1ede8f85bb8434cbd96d1688e26b5465 | |
parent | 07144fabe351f3a6021a2d213cfdba7ee55602a0 (diff) | |
download | Qt-65bca1935008012d096872647dc02c124abcab75.zip Qt-65bca1935008012d096872647dc02c124abcab75.tar.gz Qt-65bca1935008012d096872647dc02c124abcab75.tar.bz2 |
Multimedia; reorganize qt7 mediaservice provider.
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri | 18 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h (renamed from src/plugins/mediaservices/qt7/qt7playercontrol.h) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm (renamed from src/plugins/mediaservices/qt7/qt7playercontrol.mm) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h (renamed from src/plugins/mediaservices/qt7/qt7playermetadata.h) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm (renamed from src/plugins/mediaservices/qt7/qt7playermetadata.mm) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h (renamed from src/plugins/mediaservices/qt7/qt7playerservice.h) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm (renamed from src/plugins/mediaservices/qt7/qt7playerservice.mm) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h (renamed from src/plugins/mediaservices/qt7/qt7playersession.h) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm (renamed from src/plugins/mediaservices/qt7/qt7playersession.mm) | 0 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/qt7.pro | 9 | ||||
-rw-r--r-- | src/plugins/mediaservices/qt7/qt7serviceplugin.mm | 10 |
11 files changed, 26 insertions, 11 deletions
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri b/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri new file mode 100644 index 0000000..f00d418 --- /dev/null +++ b/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri @@ -0,0 +1,18 @@ +INCLUDEPATH += $$PWD + +DEFINES += Q_MEDIASERVICE_MEDIAPLAYER_AVAILABLE + +HEADERS += \ + $$PWD/qt7playercontrol.h \ + $$PWD/qt7playermetadata.h \ + $$PWD/qt7playerservice.h \ + $$PWD/qt7playersession.h + +OBJECTIVE_SOURCES += \ + $$PWD/qt7playercontrol.mm \ + $$PWD/qt7playermetadata.mm \ + $$PWD/qt7playerservice.mm \ + $$PWD/qt7playersession.mm + + + diff --git a/src/plugins/mediaservices/qt7/qt7playercontrol.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h index da86949..da86949 100644 --- a/src/plugins/mediaservices/qt7/qt7playercontrol.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h diff --git a/src/plugins/mediaservices/qt7/qt7playercontrol.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm index b74f434..b74f434 100644 --- a/src/plugins/mediaservices/qt7/qt7playercontrol.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm diff --git a/src/plugins/mediaservices/qt7/qt7playermetadata.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h index 9aa9887..9aa9887 100644 --- a/src/plugins/mediaservices/qt7/qt7playermetadata.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h diff --git a/src/plugins/mediaservices/qt7/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm index 96b7a68..96b7a68 100644 --- a/src/plugins/mediaservices/qt7/qt7playermetadata.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm diff --git a/src/plugins/mediaservices/qt7/qt7playerservice.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h index d4b30b8..d4b30b8 100644 --- a/src/plugins/mediaservices/qt7/qt7playerservice.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h diff --git a/src/plugins/mediaservices/qt7/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm index df15fa8..df15fa8 100644 --- a/src/plugins/mediaservices/qt7/qt7playerservice.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm diff --git a/src/plugins/mediaservices/qt7/qt7playersession.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h index 55505ee..55505ee 100644 --- a/src/plugins/mediaservices/qt7/qt7playersession.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h diff --git a/src/plugins/mediaservices/qt7/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm index 3131a90..3131a90 100644 --- a/src/plugins/mediaservices/qt7/qt7playersession.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm diff --git a/src/plugins/mediaservices/qt7/qt7.pro b/src/plugins/mediaservices/qt7/qt7.pro index 938bc97..13d14d7 100644 --- a/src/plugins/mediaservices/qt7/qt7.pro +++ b/src/plugins/mediaservices/qt7/qt7.pro @@ -19,32 +19,25 @@ contains(QMAKE_MAC_XARCH, no) { HEADERS += \ qt7backend.h \ - qt7playercontrol.h \ qt7videooutputcontrol.h \ qt7movieviewoutput.h \ qt7movievideowidget.h \ qt7movieviewrenderer.h \ - qt7playersession.h \ - qt7playerservice.h \ qt7serviceplugin.h \ qt7movierenderer.h \ - qt7playermetadata.h \ qcvdisplaylink.h OBJECTIVE_SOURCES += \ qt7backend.mm \ - qt7playersession.mm \ qt7serviceplugin.mm \ qt7movieviewoutput.mm \ qt7movievideowidget.mm \ qt7movieviewrenderer.mm \ - qt7playermetadata.mm \ qt7movierenderer.mm \ - qt7playercontrol.mm \ qt7videooutputcontrol.mm \ - qt7playerservice.mm \ qcvdisplaylink.mm +include(mediaplayer/mediaplayer.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mediaservices target.path = $$[QT_INSTALL_PLUGINS]/plugins/mediaservices diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm index 49ae8e0..3e2a2a6 100644 --- a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm +++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm @@ -51,16 +51,20 @@ QT_BEGIN_NAMESPACE QStringList QT7ServicePlugin::keys() const { - return QStringList() << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER); + return QStringList() +#ifdef Q_MEDIASERVICE_MEDIAPLAYER_AVAILABLE + << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER); +#endif } QMediaService* QT7ServicePlugin::create(QString const& key) { - qDebug() << "QT7ServicePlugin::create" << key; +#ifdef Q_MEDIASERVICE_MEDIAPLAYER_AVAILABLE if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER)) return new QT7PlayerService; +#endif - qDebug() << "unsupported key:" << key; + qWarning() << "Attempt to create unknown service with key" << key; return 0; } |