Create Mediaservices lib, separate from Multimedia.

14 files changed, 37 insertions, 37 deletions

diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h
index 907d13d..a546ca1 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.h
@@ -45,8 +45,8 @@
 #include <QtCore/qobject.h>
 #include <QtGui/qmacdefines_mac.h>
 
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaservices/qmediaplayercontrol.h>
+#include <QtMediaservices/qmediaplayer.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm
index 0f4ac41..90c6035 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playercontrol.mm
@@ -42,7 +42,7 @@
 #include "qt7playercontrol.h"
 #include "qt7playersession.h"
 
-#include <QtMultimedia/qmediaplaylistnavigator.h>
+#include <QtMediaservices/qmediaplaylistnavigator.h>
 
 #include <QtCore/qurl.h>
 #include <QtCore/qdebug.h>
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
index f16807a..e13df95 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
@@ -42,7 +42,7 @@
 #ifndef QT7PLAYERMETADATACONTROL_H
 #define QT7PLAYERMETADATACONTROL_H
 
-#include <QtMultimedia/qmetadatacontrol.h>
+#include <QtMediaservices/qmetadatacontrol.h>
 
 
 QT_BEGIN_HEADER
@@ -61,9 +61,9 @@ public:
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMultimedia::MetaData key) const;
-    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
-    QList<QtMultimedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaservices::MetaData key) const;
+    void setMetaData(QtMediaservices::MetaData key, const QVariant &value);
+    QList<QtMediaservices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     void setExtendedMetaData(const QString &key, const QVariant &value);
@@ -74,7 +74,7 @@ private slots:
 
 private:
     QT7PlayerSession *m_session;
-    QMap<QtMultimedia::MetaData, QVariant> m_tags;
+    QMap<QtMediaservices::MetaData, QVariant> m_tags;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
index 59d01a2..e12daf5 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
@@ -72,18 +72,18 @@ bool QT7PlayerMetaDataControl::isWritable() const
     return false;
 }
 
-QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const
+QVariant QT7PlayerMetaDataControl::metaData(QtMediaservices::MetaData key) const
 {
     return m_tags.value(key);
 }
 
-void QT7PlayerMetaDataControl::setMetaData(QtMultimedia::MetaData key, QVariant const &value)
+void QT7PlayerMetaDataControl::setMetaData(QtMediaservices::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
 
-QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
+QList<QtMediaservices::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
 {
     return m_tags.keys();
 }
@@ -256,13 +256,13 @@ void QT7PlayerMetaDataControl::updateTags()
         metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
 #endif // QUICKTIME_C_API_AVAILABLE
 
-        m_tags.insert(QtMultimedia::AlbumArtist, metaMap.value(QLatin1String("ART")));
-        m_tags.insert(QtMultimedia::AlbumTitle, metaMap.value(QLatin1String("alb")));
-        m_tags.insert(QtMultimedia::Title, metaMap.value(QLatin1String("nam")));
-        m_tags.insert(QtMultimedia::Date, metaMap.value(QLatin1String("day")));
-        m_tags.insert(QtMultimedia::Genre, metaMap.value(QLatin1String("gnre")));
-        m_tags.insert(QtMultimedia::TrackNumber, metaMap.value(QLatin1String("trk")));
-        m_tags.insert(QtMultimedia::Description, metaMap.value(QLatin1String("des")));
+        m_tags.insert(QtMediaservices::AlbumArtist, metaMap.value(QLatin1String("ART")));
+        m_tags.insert(QtMediaservices::AlbumTitle, metaMap.value(QLatin1String("alb")));
+        m_tags.insert(QtMediaservices::Title, metaMap.value(QLatin1String("nam")));
+        m_tags.insert(QtMediaservices::Date, metaMap.value(QLatin1String("day")));
+        m_tags.insert(QtMediaservices::Genre, metaMap.value(QLatin1String("gnre")));
+        m_tags.insert(QtMediaservices::TrackNumber, metaMap.value(QLatin1String("trk")));
+        m_tags.insert(QtMediaservices::Description, metaMap.value(QLatin1String("des")));
     }
 
     if (!wasEmpty || !m_tags.isEmpty())
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h
index d4b30b8..3d3a3ff 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.h
@@ -43,7 +43,7 @@
 #define QT7PLAYERSERVICE_H
 
 #include <QtCore/qobject.h>
-#include <QtMultimedia/qmediaservice.h>
+#include <QtMediaservices/qmediaservice.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
index 205e862..0b3505e 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm
@@ -54,8 +54,8 @@
 #include "qt7movievideowidget.h"
 #include "qt7playermetadata.h"
 
-#include <QtMultimedia/qmediaplaylistnavigator.h>
-#include <QtMultimedia/qmediaplaylist.h>
+#include <QtMediaservices/qmediaplaylistnavigator.h>
+#include <QtMediaservices/qmediaplaylist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h
index 0ba3041..780776c 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.h
@@ -45,8 +45,8 @@
 #include <QtCore/qobject.h>
 #include <QtGui/qmacdefines_mac.h>
 
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaservices/qmediaplayercontrol.h>
+#include <QtMediaservices/qmediaplayer.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
index 65c9f7d..863b3c8 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm
@@ -49,7 +49,7 @@
 #include "qt7videooutputcontrol.h"
 
 #include <QtNetwork/qnetworkcookie.h>
-#include <QtMultimedia/qmediaplaylistnavigator.h>
+#include <QtMediaservices/qmediaplaylistnavigator.h>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/src/plugins/mediaservices/qt7/qt7.pro b/src/plugins/mediaservices/qt7/qt7.pro
index 8791d73..baac224 100644
--- a/src/plugins/mediaservices/qt7/qt7.pro
+++ b/src/plugins/mediaservices/qt7/qt7.pro
@@ -1,7 +1,7 @@
-TARGET = qt7
+TARGET = qqt7
 include(../../qpluginbase.pri)
 
-QT += opengl multimedia
+QT += opengl mediaservices
 
 LIBS += -framework AppKit -framework AudioUnit \
         -framework AudioToolbox -framework CoreAudio \
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h
index 0fee41c..ed3eebc 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h
+++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMultimedia/qvideowindowcontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaservices/qvideowindowcontrol.h>
+#include <QtMediaservices/qmediaplayer.h>
 
 #include <QtGui/qmacdefines_mac.h>
 #include "qt7videooutputcontrol.h"
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h
index 0b515ae..334ea6a 100644
--- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h
+++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h
@@ -45,8 +45,8 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qmutex.h>
 
-#include <QtMultimedia/qvideowindowcontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaservices/qvideowindowcontrol.h>
+#include <QtMediaservices/qmediaplayer.h>
 
 #include <QtGui/qmacdefines_mac.h>
 #include "qt7videooutputcontrol.h"
diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.h b/src/plugins/mediaservices/qt7/qt7serviceplugin.h
index c5afda1..7e8acf9 100644
--- a/src/plugins/mediaservices/qt7/qt7serviceplugin.h
+++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.h
@@ -43,7 +43,7 @@
 #ifndef QT7SERVICEPLUGIN_H
 #define QT7SERVICEPLUGIN_H
 
-#include <QtMultimedia/qmediaserviceproviderplugin.h>
+#include <QtMediaservices/qmediaserviceproviderplugin.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
index c59a453..fe4ca44 100644
--- a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
+++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
@@ -45,7 +45,7 @@
 #include "qt7serviceplugin.h"
 #include "qt7playerservice.h"
 
-#include <QtMultimedia/qmediaserviceprovider.h>
+#include <QtMediaservices/qmediaserviceprovider.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h b/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h
index 3c74cb8..39a13ee 100644
--- a/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h
+++ b/src/plugins/mediaservices/qt7/qt7videooutputcontrol.h
@@ -45,11 +45,11 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qsize.h>
 
-#include <QtMultimedia/qvideooutputcontrol.h>
-#include <QtMultimedia/qvideowindowcontrol.h>
-#include <QtMultimedia/qvideowidgetcontrol.h>
-#include <QtMultimedia/qvideorenderercontrol.h>
-#include <QtMultimedia/qmediaplayer.h>
+#include <QtMediaservices/qvideooutputcontrol.h>
+#include <QtMediaservices/qvideowindowcontrol.h>
+#include <QtMediaservices/qvideowidgetcontrol.h>
+#include <QtMediaservices/qvideorenderercontrol.h>
+#include <QtMediaservices/qmediaplayer.h>
 
 #include <QtGui/qmacdefines_mac.h>