--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
class QGstreamerVideoRendererInterface;
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class QGstreamerPlayerSession : public QObject, public QGstreamerSyncEventFilter
{
@@ -91,7 +91,7 @@
void setPlaybackRate(qreal rate);
QMap<QByteArray ,QVariant> tags() const { return m_tags; }
- QMap<QtMedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
+ QMap<QtMediaServices::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
int streamCount() const { return m_streamProperties.count(); }
QMediaStreamsControl::StreamType streamType(int streamNumber) { return m_streamTypes.value(streamNumber, QMediaStreamsControl::UnknownStream); }
@@ -143,7 +143,7 @@
QGstreamerVideoRendererInterface *m_renderer;
QMap<QByteArray, QVariant> m_tags;
- QList< QMap<QtMedia::MetaData,QVariant> > m_streamProperties;
+ QList< QMap<QtMediaServices::MetaData,QVariant> > m_streamProperties;
QList<QMediaStreamsControl::StreamType> m_streamTypes;
QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;