libbluray | branch: master | hpi1 <[email protected]> | Thu May 11 17:29:34 2017 +0300| [abdf7b153cce1c0c1ec7f47220fe85c981193c5f] | committer: hpi1
Cosmetics > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=abdf7b153cce1c0c1ec7f47220fe85c981193c5f --- Makefile.am | 70 +++++++++++++++++++++++++------------------------- configure.ac | 64 ++++++++++++++++++++++----------------------- src/libbluray/bluray.c | 30 +++++++++++----------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/Makefile.am b/Makefile.am index eb190cfc..e826e3db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -139,6 +139,41 @@ libbluray_la_SOURCES = \ src/util/time.h \ src/util/time.c +# bd-j +libbluray_la_SOURCES += \ + src/libbluray/bdj/bdj.h \ + src/libbluray/bdj/bdj.c \ + src/libbluray/bdj/bdjo_data.h \ + src/libbluray/bdj/bdjo_parse.h \ + src/libbluray/bdj/bdjo_parse.c \ + src/libbluray/bdj/native/bdjo.h \ + src/libbluray/bdj/native/bdjo.c \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ + src/libbluray/bdj/native/java_awt_BDGraphics.h \ + src/libbluray/bdj/native/java_awt_BDGraphics.c \ + src/libbluray/bdj/native/org_videolan_Libbluray.h \ + src/libbluray/bdj/native/org_videolan_Libbluray.c \ + src/libbluray/bdj/native/org_videolan_Logger.h \ + src/libbluray/bdj/native/org_videolan_Logger.c \ + src/libbluray/bdj/native/register_native.h \ + src/libbluray/bdj/native/register_native.c \ + src/libbluray/bdj/native/util.h \ + src/libbluray/bdj/native/util.c + +# libudfread +libbluray_la_SOURCES += \ + src/libbluray/disc/udf_fs.h \ + src/libbluray/disc/udf_fs.c\ + \ + contrib/libudfread/src/blockinput.h \ + contrib/libudfread/src/default_blockinput.h \ + contrib/libudfread/src/default_blockinput.c \ + contrib/libudfread/src/ecma167.h \ + contrib/libudfread/src/ecma167.c \ + contrib/libudfread/src/udfread.h \ + contrib/libudfread/src/udfread.c + if HAVE_DARWIN libbluray_la_SOURCES+= \ src/file/dir_posix.c \ @@ -184,48 +219,13 @@ pkginclude_HEADERS = \ src/libbluray/decoders/overlay.h \ src/util/log_control.h -libbluray_la_SOURCES += \ - src/libbluray/disc/udf_fs.h \ - src/libbluray/disc/udf_fs.c\ - \ - contrib/libudfread/src/blockinput.h \ - contrib/libudfread/src/default_blockinput.h \ - contrib/libudfread/src/default_blockinput.c \ - contrib/libudfread/src/ecma167.h \ - contrib/libudfread/src/ecma167.c \ - contrib/libudfread/src/udfread.h \ - contrib/libudfread/src/udfread.c - if USING_BDJAVA_BUILD_JAR jardir=$(datadir)/java/ jar_DATA=$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local -endif - -libbluray_la_SOURCES += \ - src/libbluray/bdj/bdj.h \ - src/libbluray/bdj/bdj.c \ - src/libbluray/bdj/bdjo_data.h \ - src/libbluray/bdj/bdjo_parse.h \ - src/libbluray/bdj/bdjo_parse.c \ - src/libbluray/bdj/native/bdjo.h \ - src/libbluray/bdj/native/bdjo.c \ - src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ - src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ - src/libbluray/bdj/native/java_awt_BDGraphics.h \ - src/libbluray/bdj/native/java_awt_BDGraphics.c \ - src/libbluray/bdj/native/org_videolan_Libbluray.h \ - src/libbluray/bdj/native/org_videolan_Libbluray.c \ - src/libbluray/bdj/native/org_videolan_Logger.h \ - src/libbluray/bdj/native/org_videolan_Logger.c \ - src/libbluray/bdj/native/register_native.h \ - src/libbluray/bdj/native/register_native.c \ - src/libbluray/bdj/native/util.h \ - src/libbluray/bdj/native/util.c -if USING_BDJAVA_BUILD_JAR all-local: ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ diff --git a/configure.ac b/configure.ac index 566c2654..e7309a99 100644 --- a/configure.ac +++ b/configure.ac @@ -193,40 +193,40 @@ dnl use examples AM_CONDITIONAL([USING_EXAMPLES], [ test $use_examples = "yes" ]) dnl use bdjava - case $host_cpu in - x86_64) java_arch=amd64 ;; - i?86) java_arch=i386 ;; - arm*) java_arch=arm ;; - *) java_arch=$host_cpu ;; - esac - case $host_os in - linux*) java_os=linux ;; - win*) java_os=win32 ;; - mingw*) java_os=win32 ;; - freebsd*) java_os=freebsd ;; - solaris*) java_os=solaris ;; - darwin*) java_os=darwin ;; - *) java_os=$host_os ;; - esac - - AS_IF([test "x${JDK_HOME}" != "x"], [ +case $host_cpu in + x86_64) java_arch=amd64 ;; + i?86) java_arch=i386 ;; + arm*) java_arch=arm ;; + *) java_arch=$host_cpu ;; +esac +case $host_os in + linux*) java_os=linux ;; + win*) java_os=win32 ;; + mingw*) java_os=win32 ;; + freebsd*) java_os=freebsd ;; + solaris*) java_os=solaris ;; + darwin*) java_os=darwin ;; + *) java_os=$host_os ;; +esac + +AS_IF([test "x${JDK_HOME}" != "x"], [ BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os" temp_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$BDJAVA_CFLAGS $CPPFLAGS" AC_CHECK_HEADERS([jni.h], [], [AC_MSG_ERROR(could not find jni.h)]) CPPFLAGS="$temp_CPPFLAGS" - ], [ +], [ BDJAVA_CFLAGS='-I${abs_top_srcdir}/jni -I${abs_top_srcdir}/jni/'"${java_os}" - ]) +]) - AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) - if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then - AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) - fi +AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) +if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then + AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) +fi - AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) - AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) +AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) +AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) dnl BD-J type @@ -240,13 +240,13 @@ dnl bootclasspath AC_SUBST(BDJ_BOOTCLASSPATH) dnl udf support (using git submodule) - if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then - AC_MSG_ERROR("libudfread source tree not found") - fi - AC_CHECK_HEADERS([unistd.h fcntl.h]) - AS_IF([test "${SYS}" != "mingw32"], [ - AC_CHECK_FUNC([pread],, [AC_DEFINE([NEED_PREAD_IMPL], [1], [Define to 1 to use inefficient pread() replacement])]) - ]) +if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then + AC_MSG_ERROR("libudfread source tree not found") +fi +AC_CHECK_HEADERS([unistd.h fcntl.h]) +AS_IF([test "${SYS}" != "mingw32"], [ + AC_CHECK_FUNC([pread],, [AC_DEFINE([NEED_PREAD_IMPL], [1], [Define to 1 to use inefficient pread() replacement])]) +]) dnl generate documentation DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen]) diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index ab6eaaad..3763f3c6 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -2810,21 +2810,21 @@ int bd_set_player_setting_str(BLURAY *bd, uint32_t idx, const char *s) case BLURAY_PLAYER_SETTING_COUNTRY_CODE: return bd_set_player_setting(bd, idx, str_to_uint32(s, 2)); - case BLURAY_PLAYER_CACHE_ROOT: - bd_mutex_lock(&bd->mutex); - X_FREE(bd->bdjstorage.cache_root); - bd->bdjstorage.cache_root = str_dup(s); - bd_mutex_unlock(&bd->mutex); - BD_DEBUG(DBG_BDJ, "Cache root dir set to %s\n", bd->bdjstorage.cache_root); - return 1; - - case BLURAY_PLAYER_PERSISTENT_ROOT: - bd_mutex_lock(&bd->mutex); - X_FREE(bd->bdjstorage.persistent_root); - bd->bdjstorage.persistent_root = str_dup(s); - bd_mutex_unlock(&bd->mutex); - BD_DEBUG(DBG_BDJ, "Persistent root dir set to %s\n", bd->bdjstorage.persistent_root); - return 1; + case BLURAY_PLAYER_CACHE_ROOT: + bd_mutex_lock(&bd->mutex); + X_FREE(bd->bdjstorage.cache_root); + bd->bdjstorage.cache_root = str_dup(s); + bd_mutex_unlock(&bd->mutex); + BD_DEBUG(DBG_BDJ, "Cache root dir set to %s\n", bd->bdjstorage.cache_root); + return 1; + + case BLURAY_PLAYER_PERSISTENT_ROOT: + bd_mutex_lock(&bd->mutex); + X_FREE(bd->bdjstorage.persistent_root); + bd->bdjstorage.persistent_root = str_dup(s); + bd_mutex_unlock(&bd->mutex); + BD_DEBUG(DBG_BDJ, "Persistent root dir set to %s\n", bd->bdjstorage.persistent_root); + return 1; default: return 0; _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
