libbluray | branch: master | hpi1 <[email protected]> | Thu Sep 13 15:24:02 2012 +0300| [356ac9853f1220003be8097580521a1dda9c395d] | committer: hpi1
Updated TIMark (merged from dslibbluray) > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=356ac9853f1220003be8097580521a1dda9c395d --- src/libbluray/bdj/java/org/videolan/TIMark.java | 25 ++++++++++++++++++++- src/libbluray/bdj/native/org_videolan_Libbluray.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/libbluray/bdj/java/org/videolan/TIMark.java b/src/libbluray/bdj/java/org/videolan/TIMark.java index c27c6e5..293adfa 100644 --- a/src/libbluray/bdj/java/org/videolan/TIMark.java +++ b/src/libbluray/bdj/java/org/videolan/TIMark.java @@ -20,11 +20,13 @@ package org.videolan; public class TIMark { - public TIMark(int index, long start, long duration, long offset) { + public TIMark(int index, int type, long start, long duration, long offset, int clip) { this.index = index; + this.type = type; this.start = start; this.duration = duration; this.offset = offset; + this.clip = clip; } public int getIndex() { @@ -35,16 +37,37 @@ public class TIMark { return start; } + public long getStartNanoseconds() { + return start * 100000 / 9; + } + public long getDuration() { return duration; } + public long getDurationNanoseconds() { + return duration * 100000 / 9; + } + public long getOffset() { return offset; } + public int getClipIndex() { + return clip; + } + + public int getType() { + return type; + } + private int index; + private int type; private long start; private long duration; private long offset; + private int clip; + + public static final int MARK_TYPE_ENTRY = 1; + public static final int MARK_TYPE_LINK = 2; } diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index b58c035..3f82cef 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -35,7 +35,7 @@ jobject _make_playlist_info(JNIEnv* env, BLURAY_TITLE_INFO* ti) for (uint32_t i = 0; i < ti->mark_count; i++) { BLURAY_TITLE_MARK m = ti->marks[i]; jobject mark = bdj_make_object(env, "org/videolan/TIMark", - "(IJJJ)V", m.idx, m.start, m.duration, m.offset); + "(IIJJJI)V", m.idx, m.type, m.start, m.duration, m.offset, m.clip_ref); (*env)->SetObjectArrayElement(env, marks, i, mark); } _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
