From ddaacc147e1df96ac49d4276dc2cd623bb084bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Thu, 7 Jan 2016 13:00:29 +0100 Subject: Android: Call release() in AndroidMediaMetadataRetriever's destructor. This should be the default when the wrapper is destroyed. Note: It's not possible to re-use the instance after release() is called. Change-Id: I761cac05ed2c2cda49573c69c6803b136892c528 Reviewed-by: Yoann Lopes --- src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp | 2 -- src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp | 1 + src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp index fbe6a0513..b0f027ac3 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp @@ -230,8 +230,6 @@ void QAndroidMetaDataReaderControl::extractMetadata(QAndroidMetaDataReaderContro string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Year); if (!string.isNull()) metadata.insert(QMediaMetaData::Year, string.toInt()); - - retriever.release(); } const QMutexLocker lock(g_metaDataReadersMtx); diff --git a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp index 56ac0e0ac..f67428b6e 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp @@ -60,6 +60,7 @@ AndroidMediaMetadataRetriever::AndroidMediaMetadataRetriever() AndroidMediaMetadataRetriever::~AndroidMediaMetadataRetriever() { + release(); } QString AndroidMediaMetadataRetriever::extractMetadata(MetadataKey key) diff --git a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h index 01a98490b..1b4a09bb7 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h +++ b/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h @@ -71,10 +71,10 @@ public: ~AndroidMediaMetadataRetriever(); QString extractMetadata(MetadataKey key); - void release(); bool setDataSource(const QUrl &url); private: + void release(); QJNIObjectPrivate m_metadataRetriever; }; -- cgit v1.2.3