Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-Android
Commits
35fa44b7
Commit
35fa44b7
authored
Oct 14, 2014
by
Thomas Guillem
Committed by
Jean-Baptiste Kempf
Oct 14, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jni: use a define for JNI_VERSION
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
4810f7d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
vlc-android/jni/libvlcjni.c
vlc-android/jni/libvlcjni.c
+4
-2
No files found.
vlc-android/jni/libvlcjni.c
View file @
35fa44b7
...
...
@@ -52,6 +52,8 @@
#define NO_IOMX_DR ""
#endif
#define VLC_JNI_VERSION JNI_VERSION_1_2
static
void
add_media_options
(
libvlc_media_t
*
p_md
,
JNIEnv
*
env
,
jobjectArray
mediaOptions
)
{
int
stringCount
=
(
*
env
)
->
GetArrayLength
(
env
,
mediaOptions
);
...
...
@@ -121,7 +123,7 @@ static void vlc_event_callback(const libvlc_event_t *ev, void *data)
if
(
eventHandlerInstance
==
NULL
)
return
;
if
((
*
myVm
)
->
GetEnv
(
myVm
,
(
void
**
)
&
env
,
JNI_VERSION
_1_2
)
<
0
)
{
if
((
*
myVm
)
->
GetEnv
(
myVm
,
(
void
**
)
&
env
,
VLC_
JNI_VERSION
)
<
0
)
{
if
((
*
myVm
)
->
AttachCurrentThread
(
myVm
,
&
env
,
NULL
)
<
0
)
return
;
isAttached
=
true
;
...
...
@@ -209,7 +211,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved)
pthread_cond_init
(
&
vout_android_surf_attached
,
NULL
);
LOGD
(
"JNI interface loaded."
);
return
JNI_VERSION
_1_2
;
return
VLC_
JNI_VERSION
;
}
void
JNI_OnUnload
(
JavaVM
*
vm
,
void
*
reserved
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment