--- a/qtmobility/src/multimedia/qmediastreamscontrol.h Mon Jun 21 22:38:54 2010 +0100
+++ b/qtmobility/src/multimedia/qmediastreamscontrol.h Thu Jul 22 16:42:52 2010 +0100
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -49,7 +49,7 @@
QT_BEGIN_NAMESPACE
-class Q_MEDIA_EXPORT QMediaStreamsControl : public QMediaControl
+class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl
{
Q_OBJECT
@@ -61,7 +61,7 @@
virtual int streamCount() = 0;
virtual StreamType streamType(int streamNumber) = 0;
- virtual QVariant metaData(int streamNumber, QtMediaServices::MetaData key) = 0;
+ virtual QVariant metaData(int streamNumber, QtMultimediaKit::MetaData key) = 0;
virtual bool isActive(int streamNumber) = 0;
virtual void setActive(int streamNumber, bool state) = 0;