[libbluray-devel] [PATCH] Fix regression in builds without bdjava caused by cbb86e18

[Ricardo Constantino (:RiCON)]

Signed-off-by: Ricardo Constantino (:RiCON) <wiia...@gmail.com>
---
 src/libbluray/bluray.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 36e9fac..226ad29 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -1409,13 +1409,13 @@ BLURAY *bd_init(void)
     bd_mutex_init(&bd->mutex);
 #ifdef USING_BDJAVA
     bd_mutex_init(&bd->argb_buffer_mutex);
-#endif
 
     env = getenv("LIBBLURAY_PERSISTENT_STORAGE");
     if (env) {
         int v = (!strcmp(env, "yes")) ? 1 : (!strcmp(env, "no")) ? 0 : 
atoi(env);
         bd->bdjstorage.no_persistent_storage = !v;
     }
+#endif
 
     BD_DEBUG(DBG_BLURAY, "BLURAY initialized!\n");
 
@@ -2775,6 +2775,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, 
uint32_t value)
         bd_mutex_unlock(&bd->mutex);
         return result;
     }
+#ifdef USING_BDJAVA
     if (idx == BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE) {
         if (bd->title_type != title_undef) {
             BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't disable persistent storage 
during playback\n");
@@ -2783,6 +2784,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, 
uint32_t value)
         bd->bdjstorage.no_persistent_storage = !value;
         return 1;
     }
+#endif
 
     for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) {
         if (idx == map[i].idx) {
-- 
2.9.1

_______________________________________________
libbluray-devel mailing list
libbluray-devel@videolan.org
https://mailman.videolan.org/listinfo/libbluray-devel