[libbluray-devel] renamed TIhapter to TIMark
hpi1
git at videolan.org
Fri Sep 14 09:20:17 CEST 2012
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu Sep 13 15:03:48 2012 +0300| [87cca7c1fe868ad12b562c5136c23e21ca6bd7d0] | committer: hpi1
renamed TIhapter to TIMark
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=87cca7c1fe868ad12b562c5136c23e21ca6bd7d0
---
src/libbluray/bdj/java/org/videolan/TIChapter.java | 36 --------------
src/libbluray/bdj/java/org/videolan/TIMark.java | 50 ++++++++++++++++++++
src/libbluray/bdj/java/org/videolan/TitleInfo.java | 10 ++--
src/libbluray/bdj/native/org_videolan_Libbluray.c | 20 ++++----
4 files changed, 65 insertions(+), 51 deletions(-)
diff --git a/src/libbluray/bdj/java/org/videolan/TIChapter.java b/src/libbluray/bdj/java/org/videolan/TIChapter.java
deleted file mode 100644
index faa4a25..0000000
--- a/src/libbluray/bdj/java/org/videolan/TIChapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.videolan;
-
-public class TIChapter {
- public TIChapter(int index, long start, long duration, long offset)
- {
- this.index = index;
- this.start = start;
- this.duration = duration;
- this.offset = offset;
- }
-
- public int getIndex()
- {
- return index;
- }
-
- public long getStart()
- {
- return start;
- }
-
- public long getDuration()
- {
- return duration;
- }
-
- public long getOffset()
- {
- return offset;
- }
-
- private int index;
- private long start;
- private long duration;
- private long offset;
-}
diff --git a/src/libbluray/bdj/java/org/videolan/TIMark.java b/src/libbluray/bdj/java/org/videolan/TIMark.java
new file mode 100644
index 0000000..c27c6e5
--- /dev/null
+++ b/src/libbluray/bdj/java/org/videolan/TIMark.java
@@ -0,0 +1,50 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class TIMark {
+ public TIMark(int index, long start, long duration, long offset) {
+ this.index = index;
+ this.start = start;
+ this.duration = duration;
+ this.offset = offset;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public long getStart() {
+ return start;
+ }
+
+ public long getDuration() {
+ return duration;
+ }
+
+ public long getOffset() {
+ return offset;
+ }
+
+ private int index;
+ private long start;
+ private long duration;
+ private long offset;
+}
diff --git a/src/libbluray/bdj/java/org/videolan/TitleInfo.java b/src/libbluray/bdj/java/org/videolan/TitleInfo.java
index 1694d09..d5d3151 100644
--- a/src/libbluray/bdj/java/org/videolan/TitleInfo.java
+++ b/src/libbluray/bdj/java/org/videolan/TitleInfo.java
@@ -20,13 +20,13 @@
package org.videolan;
public class TitleInfo {
- public TitleInfo(int index, int playlist, long duration, int angles, TIChapter[] chapters, TIClip[] clips)
+ public TitleInfo(int index, int playlist, long duration, int angles, TIMark[] marks, TIClip[] clips)
{
this.index = index;
this.playlist = playlist;
this.duration = duration;
this.angles = angles;
- this.chapters = chapters;
+ this.marks = marks;
this.clips = clips;
}
@@ -45,9 +45,9 @@ public class TitleInfo {
return duration;
}
- public TIChapter[] getChapters()
+ public TIMark[] getMarks()
{
- return chapters;
+ return marks;
}
public TIClip[] getClips()
@@ -64,7 +64,7 @@ public class TitleInfo {
private int playlist;
private long duration;
private int angles;
- private TIChapter[] chapters;
+ private TIMark[] marks;
private TIClip[] clips;
}
diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c
index a85838c..947ca0f 100644
--- a/src/libbluray/bdj/native/org_videolan_Libbluray.c
+++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c
@@ -29,14 +29,14 @@ jobjectArray _make_stream_array(JNIEnv* env, int count, BLURAY_STREAM_INFO* stre
jobject _make_title_info(JNIEnv* env, BLURAY_TITLE_INFO* ti)
{
- jobjectArray chapters = bdj_make_array(env, "org/videolan/TIChapter",
- ti->chapter_count);
-
- for (uint32_t i = 0; i < ti->chapter_count; i++) {
- BLURAY_TITLE_CHAPTER c = ti->chapters[i];
- jobject chapter = bdj_make_object(env, "org/videolan/TIChapter",
- "(IJJJ)V", c.idx, c.start, c.duration, c.offset);
- (*env)->SetObjectArrayElement(env, chapters, i, chapter);
+ jobjectArray marks = bdj_make_array(env, "org/videolan/TIMark",
+ ti->mark_count);
+
+ 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);
+ (*env)->SetObjectArrayElement(env, marks, i, mark);
}
jobjectArray clips = bdj_make_array(env, "org/videolan/TIClip",
@@ -71,8 +71,8 @@ jobject _make_title_info(JNIEnv* env, BLURAY_TITLE_INFO* ti)
}
return bdj_make_object(env, "org/videolan/TitleInfo",
- "(IIJI[Lorg/videolan/TIChapter;[Lorg/videolan/TIClip;)V", ti->idx,
- ti->playlist, ti->duration, ti->angle_count, chapters, clips);
+ "(IIJI[Lorg/videolan/TIMark;[Lorg/videolan/TIClip;)V", ti->idx,
+ ti->playlist, ti->duration, ti->angle_count, marks, clips);
}
More information about the libbluray-devel
mailing list