Commit 7d9ad878 authored by Thomas Guillem's avatar Thomas Guillem

Media: refactor FDObject_GetInt

parent 4853aaaa
...@@ -161,11 +161,9 @@ Java_org_videolan_libvlc_Media_nativeNewFromLocation(JNIEnv *env, jobject thiz, ...@@ -161,11 +161,9 @@ Java_org_videolan_libvlc_Media_nativeNewFromLocation(JNIEnv *env, jobject thiz,
libvlc_media_new_location); libvlc_media_new_location);
} }
void static int
Java_org_videolan_libvlc_Media_nativeNewFromFd(JNIEnv *env, jobject thiz, FDObject_getInt(JNIEnv *env, jobject jfd)
jobject libVlc, jobject jfd)
{ {
vlcjni_object *p_obj;
int fd = (*env)->GetIntField(env, jfd, fields.FileDescriptor.descriptorID); int fd = (*env)->GetIntField(env, jfd, fields.FileDescriptor.descriptorID);
if ((*env)->ExceptionOccurred(env)) if ((*env)->ExceptionOccurred(env))
...@@ -176,8 +174,19 @@ Java_org_videolan_libvlc_Media_nativeNewFromFd(JNIEnv *env, jobject thiz, ...@@ -176,8 +174,19 @@ Java_org_videolan_libvlc_Media_nativeNewFromFd(JNIEnv *env, jobject thiz,
if (fd == -1) if (fd == -1)
{ {
throw_Exception(env, VLCJNI_EX_ILLEGAL_ARGUMENT, "fd invalid"); throw_Exception(env, VLCJNI_EX_ILLEGAL_ARGUMENT, "fd invalid");
return; return -1;
} }
return fd;
}
void
Java_org_videolan_libvlc_Media_nativeNewFromFd(JNIEnv *env, jobject thiz,
jobject libVlc, jobject jfd)
{
vlcjni_object *p_obj;
int fd = FDObject_getInt(env, jfd);
if (fd == -1)
return;
p_obj = VLCJniObject_newFromJavaLibVlc(env, thiz, libVlc); p_obj = VLCJniObject_newFromJavaLibVlc(env, thiz, libVlc);
if (!p_obj) if (!p_obj)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment