diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-07-17 18:41:44 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@digia.com> | 2014-08-25 17:29:37 +0200 |
| commit | 341b86c63fbe9e9f284e2d6547cb639f487a2ec4 (patch) | |
| tree | 24eed023702ebbe11c625f3afc4975db622a9e7b /src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h | |
| parent | fb35f025e320ef1639adf9a5d7bee73faa44e442 (diff) | |
Android: fix retrieving metadata from assets, qrc and remote files.
We need the same logic as for the media player: local files and assets
must be loaded with a FileDescriptor.
Because of a bug in Android API level >= 14, remote files have to be
loaded in different ways depending on the version.
Task-number: QTBUG-40274
Change-Id: I6411b959064d22219cf981a4dc8f4f26cf16f65f
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h')
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h index f18cec11d..1a4a876ee 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h +++ b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h @@ -43,7 +43,6 @@ #define ANDROIDMEDIAMETADATARETRIEVER_H #include <QtCore/private/qjni_p.h> -#include <qurl.h> QT_BEGIN_NAMESPACE @@ -81,8 +80,7 @@ public: QString extractMetadata(MetadataKey key); void release(); - bool setDataSource(const QUrl &url); - bool setDataSource(const QString &path); + bool setDataSource(const QString &url); private: QJNIObjectPrivate m_metadataRetriever; |