[libbluray-devel] Remove BDJ_BDJO_PATH

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Sep 30 13:36:33 2014 +0300| [532de3ac9c51d79ce0817abc8955e4a43802b64d] | committer: hpi1

Remove BDJ_BDJO_PATH

all other paths are hard-coded

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=532de3ac9c51d79ce0817abc8955e4a43802b64d
---

 src/libbluray/bdj/common.h                        |    2 --
 src/libbluray/bdj/native/org_videolan_Libbluray.c |    3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libbluray/bdj/common.h b/src/libbluray/bdj/common.h
index b930510..1ee94d4 100644
--- a/src/libbluray/bdj/common.h
+++ b/src/libbluray/bdj/common.h
@@ -22,6 +22,4 @@
 
 #include "config.h"
 
-#define BDJ_BDJO_PATH "/BDMV/BDJO"
-
 #endif /* BDJ_COMMON_H_ */
diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c
index 052f02e..7bea412 100644
--- a/src/libbluray/bdj/native/org_videolan_Libbluray.c
+++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c
@@ -22,7 +22,6 @@
 #include "libbluray/bdj/bdj_private.h"
 #include "libbluray/bdj/bdj_util.h"
 #include "libbluray/bdj/bdjo_parser.h"
-#include "libbluray/bdj/common.h"  // BDJ_BDJO_PATH
 #include "libbluray/bluray.h"
 #include "libbluray/bluray_internal.h"
 
@@ -412,7 +411,7 @@ JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getBdjoN(JNIEnv * env,
 
   BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
   const char *bdjo_name = (*env)->GetStringUTFChars(env, name, NULL);;
-  char* bdjo_path = str_printf("%s%s/%s.bdjo", bdj->path, BDJ_BDJO_PATH, bdjo_name);
+  char* bdjo_path = str_printf("%s/BDMV/BDJO/%s.bdjo", bdj->path, bdjo_name);
   (*env)->ReleaseStringUTFChars(env, name, bdjo_name);
   jobject bdjo = bdjo_read(env, bdjo_path);
   X_FREE(bdjo_path);