summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/mmf_videoplayer.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-06 22:55:48 +0100
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-06 22:55:48 +0100
commit360a51d64c607f5efae7a4f25a9a519424399b69 (patch)
tree874eb46ab469865ce9d9b58b9d1cf86d49e5bd1c /src/3rdparty/phonon/mmf/mmf_videoplayer.h
parent7359baee83f6691c31a0a14ffd6f6cc147ed71fd (diff)
parent2b91557c93354b766c78cbc4ab48bcd58207bf1a (diff)
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/mmf_videoplayer.h')
-rw-r--r--src/3rdparty/phonon/mmf/mmf_videoplayer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
index 8072404372..fa4e59b65a 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
@@ -86,6 +86,10 @@ private:
void updateMmfOutput();
+ // AbstractMediaPlayer
+ virtual int numberOfMetaDataEntries() const;
+ virtual QPair<QString, QString> metaDataEntry(int index) const;
+
private:
QScopedPointer<CVideoPlayerUtility> m_player;