libbluray | branch: master | hpi1 <[email protected]> | Wed Nov 27 17:04:40 2013 +0200| [ba603058ba5dd6c0662d35a462018176c29e946b] | committer: hpi1
Removed org.videolan.Libbluray.getCurrentTitleN (read the register directly) > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=ba603058ba5dd6c0662d35a462018176c29e946b --- src/libbluray/bdj/java/org/videolan/Libbluray.java | 3 +-- src/libbluray/bdj/native/org_videolan_Libbluray.c | 11 ----------- src/libbluray/bdj/native/org_videolan_Libbluray.h | 8 -------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/libbluray/bdj/java/org/videolan/Libbluray.java b/src/libbluray/bdj/java/org/videolan/Libbluray.java index e669349..762bede 100644 --- a/src/libbluray/bdj/java/org/videolan/Libbluray.java +++ b/src/libbluray/bdj/java/org/videolan/Libbluray.java @@ -240,7 +240,7 @@ public class Libbluray { } public static int getCurrentTitle() { - return getCurrentTitleN(nativePointer); + return readPSR(PSR_TITLE_NUMBER); } public static int getCurrentAngle() { @@ -451,7 +451,6 @@ public class Libbluray { private static native long getTitleSizeN(long np); private static native long getUOMaskN(long np); private static native void setUOMaskN(long np, boolean menuCallMask, boolean titleSearchMask); - private static native int getCurrentTitleN(long np); private static native int getCurrentAngleN(long np); private static native long tellN(long np); private static native long tellTimeN(long np); diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index 6605db0..6fa96cb 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -312,12 +312,6 @@ JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_getTitleSizeN(JNIEnv * env, return bd_get_title_size(bdj->bd); } -JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentTitleN( - JNIEnv * env, jclass cls, jlong np) { - BDJAVA* bdj = (BDJAVA*)(intptr_t)np; - return bd_psr_read(bdj->reg, PSR_TITLE_NUMBER); -} - JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentAngleN( JNIEnv * env, jclass cls, jlong np) { BDJAVA* bdj = (BDJAVA*)(intptr_t)np; @@ -604,11 +598,6 @@ Java_org_videolan_Libbluray_methods[] = VC(Java_org_videolan_Libbluray_getTitleSizeN), }, { - CC("getCurrentTitleN"), - CC("(J)I"), - VC(Java_org_videolan_Libbluray_getCurrentTitleN), - }, - { CC("getCurrentAngleN"), CC("(J)I"), VC(Java_org_videolan_Libbluray_getCurrentAngleN), diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.h b/src/libbluray/bdj/native/org_videolan_Libbluray.h index 0ff59ca..dea2ac5 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.h +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.h @@ -238,14 +238,6 @@ JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_getTitleSizeN /* * Class: org_videolan_Libbluray - * Method: getCurrentTitleN - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentTitleN - (JNIEnv *, jclass, jlong); - -/* - * Class: org_videolan_Libbluray * Method: getCurrentAngleN * Signature: (J)I */ _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
