diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-09 09:41:38 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-09 09:41:38 (GMT) |
| commit | bc3abd32ed1c5a872d7a7817c1af0a13f442d536 (patch) | |
| tree | 37d617a7baf54844bb4c396628b867ecb3b0b29e /src/3rdparty/phonon/qt7/quicktimemetadata.h | |
| parent | 6d25d222b2bb418139e123b59366db908ee3188a (diff) | |
| parent | 91ceb21d1d5f6447a47853b6625fb51d2f21cf16 (diff) | |
| download | Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.zip Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.gz Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/3rdparty/phonon/qt7/quicktimemetadata.h')
| -rw-r--r-- | src/3rdparty/phonon/qt7/quicktimemetadata.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/qt7/quicktimemetadata.h b/src/3rdparty/phonon/qt7/quicktimemetadata.h index d524183..c589535 100644 --- a/src/3rdparty/phonon/qt7/quicktimemetadata.h +++ b/src/3rdparty/phonon/qt7/quicktimemetadata.h @@ -38,10 +38,8 @@ namespace QT7 class QuickTimeMetaData { public: - QuickTimeMetaData(); - virtual ~QuickTimeMetaData(); - - void setVideo(QuickTimeVideoPlayer *videoPlayer); + QuickTimeMetaData(QuickTimeVideoPlayer *videoPlayer); + void update(); QMultiMap<QString, QString> metaData(); private: @@ -49,6 +47,8 @@ namespace QT7 bool m_movieChanged; QuickTimeVideoPlayer *m_videoPlayer; void readMetaData(); + void guessMetaDataForCD(); + void readMetaDataFromMovie(); #ifdef QUICKTIME_C_API_AVAILABLE QString stripCopyRightSymbol(const QString &key); |