diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2013-10-08 16:15:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 14:21:48 +0200 |
| commit | 7d24543c27bf3eebe1ac7c8f625c6e9c9fbdbdec (patch) | |
| tree | 9a0ef724e880ed5368da95769f74a9a849a03cf2 /src/plugins/directshow/player/directshowmetadatacontrol.h | |
| parent | 8d7879087255f06b83b5a68ff54990dfc2cbe655 (diff) | |
DirectShow: improve metadata support.
Correctly return the list of available metadata.
On Windows Vista and later, we now use shell properties to retrieve the
metadata. This allows us to get much more metadata properties.
Task-number: QTBUG-30776
Change-Id: If542756d08d832903984ef10d09c4caf410bdb1c
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/directshow/player/directshowmetadatacontrol.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.h b/src/plugins/directshow/player/directshowmetadatacontrol.h index fb740ee1c..935e75ee0 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.h +++ b/src/plugins/directshow/player/directshowmetadatacontrol.h @@ -46,12 +46,6 @@ #include "directshowglobal.h" -#include <qnetwork.h> - -#ifndef QT_NO_WMSDK -#include <wmsdk.h> -#endif - #include <QtCore/qcoreevent.h> class DirectShowPlayerService; @@ -70,7 +64,8 @@ public: QVariant metaData(const QString &key) const; QStringList availableMetaData() const; - void updateGraph(IFilterGraph2 *graph, IBaseFilter *source); + void updateGraph(IFilterGraph2 *graph, IBaseFilter *source, + const QString &fileSrc = QString()); protected: void customEvent(QEvent *event); @@ -81,10 +76,8 @@ private: MetaDataChanged = QEvent::User }; - IAMMediaContent *m_content; -#ifndef QT_NO_WMSDK - IWMHeaderInfo *m_headerInfo; -#endif + QVariantMap m_metadata; + bool m_available; }; #endif |