open/vlc-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Medialibrary: Update API

Browse Source 
(cherry picked from commit eec68abbab)
This commit is contained in:
Geoffrey Métais
2019-10-14 15:08:22 +02:00
parent 70e7411217
commit dfff5c7658
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
medialibrary/jni/medialibrary.cpp
View File

@@ -10,6 +10,7 @@
#include "log.h"
#include "utils.h"
#include "AndroidMediaLibrary.h"
#include <medialibrary/filesystem/Errors.h>
static JavaVM *myVm;
static fields ml_fields;
@@ -1749,7 +1750,7 @@ folders(JNIEnv* env, jobject thiz, jint type, jint sortingCriteria, jboolean des
env->SetObjectArrayElement(foldersRefs, ++index, item);
env->DeleteLocalRef(item);
}
catch( const medialibrary::fs::DeviceRemovedException& )
catch( const medialibrary::fs::errors::DeviceRemoved& )
{
// Ignore this folder since it's on a removed device.
}
@@ -1793,7 +1794,7 @@ videoGroups(JNIEnv* env, jobject thiz, jint sortingCriteria, jboolean desc, jint
env->SetObjectArrayElement(groupsRefs, ++index, item);
env->DeleteLocalRef(item);
}
catch( const medialibrary::fs::DeviceRemovedException& )
catch( const medialibrary::fs::errors::DeviceRemoved& )
{
// Ignore this VideoGroup since it's on a removed device.
}

2
medialibrary/jni/utils.cpp
View File

@@ -53,7 +53,7 @@ mediaToMediaWrapper(JNIEnv* env, fields *fields, medialibrary::MediaPtr const& m
filename = mediaPtr->fileName().empty() ? NULL : env->NewStringUTF(mediaPtr->fileName().c_str());
try {
mrl = env->NewStringUTF(files.at(0)->mrl().c_str());
} catch(const medialibrary::fs::DeviceRemovedException&) {
} catch(const medialibrary::fs::errors::DeviceRemoved&) {
return nullptr;
}
thumbnail = mediaPtr->thumbnailMrl(medialibrary::ThumbnailSizeType::Thumbnail).empty() ? NULL : env->NewStringUTF(mediaPtr->thumbnailMrl(medialibrary::ThumbnailSizeType::Thumbnail).c_str());

1
medialibrary/jni/utils.h
View File

@@ -36,6 +36,7 @@
#include <medialibrary/IMetadata.h>
#include<medialibrary/filesystem/IDevice.h>
#include <medialibrary/IVideoGroup.h>
#include <medialibrary/filesystem/Errors.h>
#define VLC_JNI_VERSION JNI_VERSION_1_2