From 7d24543c27bf3eebe1ac7c8f625c6e9c9fbdbdec Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Tue, 8 Oct 2013 16:15:04 +0200
Subject: 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>
---
 src/plugins/directshow/player/directshowmetadatacontrol.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/plugins/directshow/player/directshowmetadatacontrol.h')

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
-- 
cgit v1.2.3