libbluray | branch: master | hpi1 <[email protected]> | Fri Sep 14 10:28:57 2012 +0300| [0b8c07bee2a3785ea963ac4ba69a37cdbeaaa1d0] | committer: hpi1
Updated org.videolan.PlaylistInfo and org.bluray.ti.PlayListImpl (merge from dslibbluray) > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=0b8c07bee2a3785ea963ac4ba69a37cdbeaaa1d0 --- src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java | 4 ++-- src/libbluray/bdj/java/org/videolan/PlaylistInfo.java | 16 +++++++++------- src/libbluray/bdj/native/org_videolan_Libbluray.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java b/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java index 04e0396..93f85f0 100644 --- a/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java +++ b/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java @@ -9,7 +9,7 @@ import org.bluray.net.BDLocator; import org.davic.net.InvalidLocatorException; import org.videolan.Libbluray; import org.videolan.TIClip; -import org.videolan.TitleInfo; +import org.videolan.PlaylistInfo; public class PlayListImpl implements PlayList { protected PlayListImpl(String filename, Title service) @@ -64,7 +64,7 @@ public class PlayListImpl implements PlayList { } String filename; - TitleInfo playlist; + PlaylistInfo playlist; int id; Title service; } diff --git a/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java b/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java index 352ec9f..e0d6508 100644 --- a/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java +++ b/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java @@ -20,8 +20,7 @@ package org.videolan; public class PlaylistInfo { - public PlaylistInfo(int index, int playlist, long duration, int angles, TIMark[] marks, TIClip[] clips) { - this.index = index; + public PlaylistInfo(int playlist, long duration, int angles, TIMark[] marks, TIClip[] clips) { this.playlist = playlist; this.duration = duration; this.angles = angles; @@ -29,10 +28,6 @@ public class PlaylistInfo { this.clips = clips; } - public int getIndex() { - return index; - } - public int getPlaylist() { return playlist; } @@ -41,10 +36,18 @@ public class PlaylistInfo { return duration; } + public int getMarkCount() { + return marks.length; + } + public TIMark[] getMarks() { return marks; } + public int getClipCount() { + return clips.length; + } + public TIClip[] getClips() { return clips; } @@ -53,7 +56,6 @@ public class PlaylistInfo { return angles; } - private int index; private int playlist; private long duration; private int angles; diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index 3f82cef..01a8d47 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -70,8 +70,8 @@ jobject _make_playlist_info(JNIEnv* env, BLURAY_TITLE_INFO* ti) (*env)->SetObjectArrayElement(env, clips, i, clip); } - return bdj_make_object(env, "org/videolan/TitleInfo", - "(IIJI[Lorg/videolan/TIMark;[Lorg/videolan/TIClip;)V", ti->idx, + return bdj_make_object(env, "org/videolan/PlaylistInfo", + "(IJI[Lorg/videolan/TIMark;[Lorg/videolan/TIClip;)V", ti->playlist, ti->duration, ti->angle_count, marks, clips); } _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
