libbluray | branch: master | hpi1 <[email protected]> | Thu Sep 13 21:34:19 2012 +0300| [98a4decb56447d481fc7d36c6211ebc0b5ee2c60] | committer: hpi1
Renamed TitleInfo to PlaylistInfo > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=98a4decb56447d481fc7d36c6211ebc0b5ee2c60 --- src/libbluray/bdj/java/org/videolan/Libbluray.java | 8 ++--- .../videolan/{TitleInfo.java => PlaylistInfo.java} | 32 ++++++++------------ .../videolan/media/content/playlist/Handler.java | 8 ++--- src/libbluray/bdj/native/org_videolan_Libbluray.c | 6 ++-- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/libbluray/bdj/java/org/videolan/Libbluray.java b/src/libbluray/bdj/java/org/videolan/Libbluray.java index 8306a55..3dc4406 100644 --- a/src/libbluray/bdj/java/org/videolan/Libbluray.java +++ b/src/libbluray/bdj/java/org/videolan/Libbluray.java @@ -27,14 +27,14 @@ public class Libbluray { return getTitlesN(nativePointer, flags); } - public static TitleInfo getTitleInfo(int titleNum) { + public static PlaylistInfo getTitleInfo(int titleNum) { if (titleNum < 0) throw new IllegalArgumentException(); return getTitleInfoN(nativePointer, titleNum); } - public static TitleInfo getPlaylistInfo(int playlist) { + public static PlaylistInfo getPlaylistInfo(int playlist) { return getPlaylistInfoN(nativePointer, playlist); } @@ -189,8 +189,8 @@ public class Libbluray { protected static long nativePointer = 0; - private static native TitleInfo getTitleInfoN(long np, int title); - private static native TitleInfo getPlaylistInfoN(long np, int playlist); + private static native PlaylistInfo getTitleInfoN(long np, int title); + private static native PlaylistInfo getPlaylistInfoN(long np, int playlist); private static native int getTitlesN(long np, char flags); private static native long seekN(long np, long pos); private static native long seekTimeN(long np, long tick); diff --git a/src/libbluray/bdj/java/org/videolan/TitleInfo.java b/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java similarity index 77% rename from src/libbluray/bdj/java/org/videolan/TitleInfo.java rename to src/libbluray/bdj/java/org/videolan/PlaylistInfo.java index d5d3151..352ec9f 100644 --- a/src/libbluray/bdj/java/org/videolan/TitleInfo.java +++ b/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java @@ -19,9 +19,8 @@ package org.videolan; -public class TitleInfo { - public TitleInfo(int index, int playlist, long duration, int angles, TIMark[] marks, TIClip[] clips) - { +public class PlaylistInfo { + public PlaylistInfo(int index, int playlist, long duration, int angles, TIMark[] marks, TIClip[] clips) { this.index = index; this.playlist = playlist; this.duration = duration; @@ -29,34 +28,28 @@ public class TitleInfo { this.marks = marks; this.clips = clips; } - - public int getIndex() - { + + public int getIndex() { return index; } - public int getPlaylist() - { + public int getPlaylist() { return playlist; } - public long getDuration() - { + public long getDuration() { return duration; } - public TIMark[] getMarks() - { + public TIMark[] getMarks() { return marks; } - - public TIClip[] getClips() - { + + public TIClip[] getClips() { return clips; } - - public int getAngleCount() - { + + public int getAngleCount() { return angles; } @@ -66,5 +59,4 @@ public class TitleInfo { private int angles; private TIMark[] marks; private TIClip[] clips; - -} +} \ No newline at end of file diff --git a/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java b/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java index 75f615b..43463a2 100644 --- a/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java +++ b/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java @@ -49,7 +49,7 @@ import javax.media.protocol.DataSource; import org.bluray.media.OverallGainControl; import org.videolan.Libbluray; -import org.videolan.TitleInfo; +import org.videolan.PlaylistInfo; public class Handler implements Player { public Handler() @@ -87,7 +87,7 @@ public class Handler implements Player { org.videolan.media.protocol.bd.DataSource playlistSrc = (org.videolan.media.protocol.bd.DataSource)source; - ti = Libbluray.getPlaylistInfo(playlistSrc.getPlaylist()); + pi = Libbluray.getPlaylistInfo(playlistSrc.getPlaylist()); } else { throw new IncompatibleSourceException(); } @@ -260,7 +260,7 @@ public class Handler implements Player { public Time getDuration() { - long duration = ti.getDuration() ; + long duration = pi.getDuration() ; return new Time(duration * TO_SECONDS); } @@ -315,7 +315,7 @@ public class Handler implements Player { protected static final double TO_SECONDS = 1 / 90000.0; protected static final double FROM_SECONDS = 90000.0; - protected TitleInfo ti; + protected PlaylistInfo pi; private Control[] controls; private Time stopTime = Clock.RESET; diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index 947ca0f..b58c035 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -27,7 +27,7 @@ jobjectArray _make_stream_array(JNIEnv* env, int count, BLURAY_STREAM_INFO* stre return streamArr; } -jobject _make_title_info(JNIEnv* env, BLURAY_TITLE_INFO* ti) +jobject _make_playlist_info(JNIEnv* env, BLURAY_TITLE_INFO* ti) { jobjectArray marks = bdj_make_array(env, "org/videolan/TIMark", ti->mark_count); @@ -85,7 +85,7 @@ JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getTitleInfoN if (!ti) return NULL; - jobject titleInfo = _make_title_info(env, ti); + jobject titleInfo = _make_playlist_info(env, ti); bd_free_title_info(ti); @@ -100,7 +100,7 @@ JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getPlaylistInfoN if (!ti) return NULL; - jobject titleInfo = _make_title_info(env, ti); + jobject titleInfo = _make_playlist_info(env, ti); bd_free_title_info(ti); _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
