--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h Tue Jan 26 12:42:25 2010 +0200
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h Tue Feb 02 00:43:10 2010 +0200
@@ -56,8 +56,6 @@
virtual MediaSource source() const;
virtual void setFileSource(const Phonon::MediaSource&, RFile&);
virtual void setNextSource(const MediaSource &source);
-
- // VolumeObserver
virtual void volumeChanged(qreal volume);
protected:
@@ -71,11 +69,11 @@
virtual int setDeviceVolume(int mmfVolume) = 0;
virtual int openFile(RFile& file) = 0;
virtual void close() = 0;
+ virtual void changeState(PrivateState newState);
- /**
- * Changes state and emits stateChanged()
- */
- virtual void changeState(PrivateState newState);
+ void updateMetaData();
+ virtual int numberOfMetaDataEntries() const = 0;
+ virtual QPair<QString, QString> metaDataEntry(int index) const = 0;
protected:
bool tickTimerRunning() const;
@@ -109,6 +107,8 @@
MediaSource m_source;
MediaSource m_nextSource;
+ QMultiMap<QString, QString> m_metaData;
+
};
}
}