Skip to content
Snippets Groups Projects
Commit 72b094f9 authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf
Browse files

LibVLC: update MediaPlayer.addSlave

parent 32a3ace1
No related branches found
No related tags found
No related merge requests found
......@@ -884,7 +884,7 @@ Java_org_videolan_libvlc_MediaPlayer_nativeSetSpuDelay(JNIEnv *env,
jboolean
Java_org_videolan_libvlc_MediaPlayer_nativeAddSlave(JNIEnv *env,
jobject thiz, jint type,
jstring jmrl)
jstring jmrl, jboolean select)
{
vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
const char* psz_mrl;
......@@ -898,7 +898,7 @@ Java_org_videolan_libvlc_MediaPlayer_nativeAddSlave(JNIEnv *env,
return false;
}
jboolean ret = libvlc_media_player_add_slave(p_obj->u.p_mp, type, psz_mrl) == 0;
jboolean ret = libvlc_media_player_add_slave(p_obj->u.p_mp, type, psz_mrl, select) == 0;
(*env)->ReleaseStringUTFChars(env, jmrl, psz_mrl);
return ret;
......
......@@ -719,8 +719,8 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
* @param uri a valid RFC 2396 Uri
* @return true on success.
*/
public boolean addSlave(int type, Uri uri) {
return nativeAddSlave(type, Media.locationFromUri(uri));
public boolean addSlave(int type, Uri uri, boolean select) {
return nativeAddSlave(type, Media.locationFromUri(uri), select);
}
/**
......@@ -730,8 +730,8 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
* @param path a local path
* @return true on success.
*/
public boolean addSlave(int type, String path) {
return addSlave(type, Uri.fromFile(new File(path)));
public boolean addSlave(int type, String path, boolean select) {
return addSlave(type, Uri.fromFile(new File(path)), select);
}
/**
......@@ -887,6 +887,6 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
private native boolean nativeSetSpuTrack(int index);
private native long nativeGetSpuDelay();
private native boolean nativeSetSpuDelay(long delay);
private native boolean nativeAddSlave(int type, String location);
private native boolean nativeAddSlave(int type, String location, boolean select);
private native boolean nativeSetEqualizer(Equalizer equalizer);
}
......@@ -279,12 +279,11 @@ public class MediaPlayer
public static final String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
public void addTimedTextSource(String path, String mimeType) {
mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, path);
mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, path, false);
}
// FIXME: This is incorrect, since libVLC can only add local subtitles
public void addTimedTextSource(Context context, Uri uri, String mimeType) {
mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, uri);
mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, uri, false);
}
public void addTimedTextSource(FileDescriptor fd, String mimeType)
......
......@@ -1728,7 +1728,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback {
public void run() {
final ArrayList<Media.Slave> list = MediaDatabase.getInstance().getSlaves(mw.getLocation());
for (Media.Slave slave : list)
mMediaPlayer.addSlave(slave.type, Uri.parse(slave.uri));
mMediaPlayer.addSlave(slave.type, Uri.parse(slave.uri), false);
}
});
......@@ -2043,14 +2043,24 @@ public class PlaybackService extends Service implements IVLCVout.Callback {
return mMediaPlayer.getVideoTracksCount();
}
@MainThread
public boolean addSubtitleTrack(String path, boolean select) {
return mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, path, select);
}
@MainThread
public boolean addSubtitleTrack(Uri uri,boolean select) {
return mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, uri, select);
}
@MainThread
public boolean addSubtitleTrack(String path) {
return mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, path);
return addSubtitleTrack(path, false);
}
@MainThread
public boolean addSubtitleTrack(Uri uri) {
return mMediaPlayer.addSlave(Media.Slave.Type.Subtitle, uri);
return addSubtitleTrack(uri, false);
}
@MainThread
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment