[libbluray-devel] Simplify
hpi1
git at videolan.org
Tue Jan 17 11:33:06 CET 2017
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Mon Dec 12 10:25:29 2016 +0200| [064287d55a0928ea4a19f3061d244724ce0a5b7f] | committer: hpi1
Simplify
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=064287d55a0928ea4a19f3061d244724ce0a5b7f
---
src/libbluray/bdj/bdj.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index a85e7d5..3a75076 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -305,12 +305,11 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
{
// pre-defined search paths for libbluray.jar
static const char * const jar_paths[] = {
-#ifdef _WIN32
- "" BDJ_JARFILE,
-#else
+#ifndef _WIN32
"/usr/share/java/" BDJ_JARFILE,
"/usr/share/libbluray/lib/" BDJ_JARFILE,
#endif
+ BDJ_JARFILE,
};
unsigned i;
@@ -375,13 +374,6 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
}
}
- // try from current directory
- if (_can_read_file(BDJ_JARFILE)) {
- storage->classpath = str_dup(BDJ_JARFILE);
- BD_DEBUG(DBG_BDJ, "using %s\n", storage->classpath);
- return storage->classpath;
- }
-
BD_DEBUG(DBG_BDJ | DBG_CRIT, BDJ_JARFILE" not found.\n");
return NULL;
}
More information about the libbluray-devel
mailing list