Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-Android
Commits
2ea98b8d
Commit
2ea98b8d
authored
Dec 31, 2014
by
Thomas Guillem
Browse files
libvlc: native expendMedia doesn't need position
parent
ad4b1809
Changes
3
Hide whitespace changes
Inline
Side-by-side
libvlc/jni/libvlcjni-medialist.c
View file @
2ea98b8d
...
...
@@ -75,7 +75,7 @@ static int expand_media_internal(JNIEnv *env, libvlc_instance_t* p_instance, job
}
}
jint
Java_org_videolan_libvlc_LibVLC_expandMedia
(
JNIEnv
*
env
,
jobject
thiz
,
jint
position
,
jobject
children
)
{
jint
Java_org_videolan_libvlc_LibVLC_expandMedia
(
JNIEnv
*
env
,
jobject
thiz
,
jobject
children
)
{
return
(
jint
)
expand_media_internal
(
env
,
getLibVlcInstance
(
env
,
thiz
),
children
,
...
...
libvlc/src/org/videolan/libvlc/LibVLC.java
View file @
2ea98b8d
...
...
@@ -849,5 +849,5 @@ public class LibVLC {
/* MediaList */
protected
native
void
loadPlaylist
(
String
mrl
,
ArrayList
<
String
>
items
);
protected
native
int
expandMedia
(
int
position
,
ArrayList
<
String
>
children
);
protected
native
int
expandMedia
(
ArrayList
<
String
>
children
);
}
libvlc/src/org/videolan/libvlc/MediaList.java
View file @
2ea98b8d
...
...
@@ -71,7 +71,7 @@ public class MediaList {
*/
public
int
expandMedia
(
int
position
)
{
ArrayList
<
String
>
children
=
new
ArrayList
<
String
>();
int
ret
=
mLibVLC
.
expandMedia
(
position
,
children
);
int
ret
=
mLibVLC
.
expandMedia
(
children
);
if
(
ret
==
0
)
{
mEventHandler
.
callback
(
EventHandler
.
CustomMediaListExpanding
,
new
Bundle
());
this
.
remove
(
position
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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