[libbluray-devel] Remove unused path from BD-J native side state

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu Nov  6 12:42:11 2014 +0200| [78ac7e38616c949744c901e71a14b5d6a0ad23ef] | committer: hpi1

Remove unused path from BD-J native side state

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

 src/libbluray/bdj/bdj.c         |    7 +++----
 src/libbluray/bdj/bdj_private.h |    2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 2b23113..8c969de 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -340,7 +340,7 @@ static int _get_method(JNIEnv *env, jclass *cls, jmethodID *method_id,
     return 1;
 }
 
-static int _bdj_init(BDJAVA *bdjava, JNIEnv *env, const char *bdj_disc_id)
+static int _bdj_init(BDJAVA *bdjava, JNIEnv *env, const char *disc_root, const char *bdj_disc_id)
 {
     if (!bdj_register_native_methods(env)) {
         BD_DEBUG(DBG_BDJ | DBG_CRIT, "Couldn't register native methods.\n");
@@ -357,7 +357,7 @@ static int _bdj_init(BDJAVA *bdjava, JNIEnv *env, const char *bdj_disc_id)
     const char *disc_id = (bdj_disc_id && bdj_disc_id[0]) ? bdj_disc_id : "00000000000000000000000000000000";
     jlong param_bdjava_ptr = (jlong)(intptr_t) bdjava;
     jstring param_disc_id = (*env)->NewStringUTF(env, disc_id);
-    jstring param_disc_root = (*env)->NewStringUTF(env, bdjava->path);
+    jstring param_disc_root = (*env)->NewStringUTF(env, disc_root);
     (*env)->CallStaticVoidMethod(env, init_class, init_id,
                                  param_bdjava_ptr, param_disc_id, param_disc_root);
 
@@ -508,7 +508,6 @@ BDJAVA* bdj_open(const char *path, struct bluray *bd,
 
     BDJAVA* bdjava = calloc(1, sizeof(BDJAVA));
     bdjava->bd = bd;
-    bdjava->path = path;
     bdjava->h_libjvm = jvm_lib;
     bdjava->osd_cb = osd_cb;
     bdjava->buf = buf;
@@ -519,7 +518,7 @@ BDJAVA* bdj_open(const char *path, struct bluray *bd,
         BD_DEBUG(DBG_BDJ, "Java version: %d.%d\n", version >> 16, version & 0xffff);
     }
 
-    if (!_bdj_init(bdjava, env, bdj_disc_id)) {
+    if (!_bdj_init(bdjava, env, path, bdj_disc_id)) {
         bdj_close(bdjava);
         return NULL;
     }
diff --git a/src/libbluray/bdj/bdj_private.h b/src/libbluray/bdj/bdj_private.h
index e5b0bae..e1c301c 100644
--- a/src/libbluray/bdj/bdj_private.h
+++ b/src/libbluray/bdj/bdj_private.h
@@ -30,8 +30,6 @@ struct bd_argb_buffer_s;
 struct bdjava_s {
     struct bluray      *bd;
 
-    const char         *path;
-
     bdj_overlay_cb           osd_cb;
     struct bd_argb_buffer_s *buf;