summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-04-15 23:41:10 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-04-15 23:41:10 (GMT)
commitba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f (patch)
tree522f5ac1ced6c3116ea28b77874a8bb7447a88d0
parent06d71fb79ad850c62a1b95fbeec607dfc4220489 (diff)
downloadQt-ba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f.zip
Qt-ba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f.tar.gz
Qt-ba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f.tar.bz2
Fixed compile errors with gstreamer plugin
Reviewed-by:Justin McPherson
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp2
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h2
-rw-r--r--src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 05b924a..51d68f9 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -172,7 +172,7 @@ QList<QtMediaservices::MetaData> QGstreamerMetaDataProvider::availableMetaData()
QList<QtMediaservices::MetaData> res;
foreach (const QByteArray &key, m_session->tags().keys()) {
- QtMediaservices::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
+ QtMediaservices::MetaData tag = keysMap.value(key, QtMediaservices::MetaData(-1));
if (tag != -1)
res.append(tag);
}
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h
index bb77eff..5239464 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayercontrol.h
@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
-#include <QtMediaservies/qmediaplayercontrol.h>
+#include <QtMediaservices/qmediaplayercontrol.h>
#include <QtMediaservices/qmediaplayer.h>
#include <limits.h>
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h
index f60c72e..fe4a8a9 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayerservice.h
@@ -45,7 +45,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qiodevice.h>
-#include <QtMultimedia/qmediaservice.h>
+#include <QtMediaservices/qmediaservice.h>
#include "qgstreamervideooutputcontrol.h"