libbluray | branch: master | hpi1 <[email protected]> | Tue Oct 28 12:37:14 2014 +0200| [b2958b640bba7edbfa8dbc9f9157cc1f48db8fd2] | committer: hpi1
bdj headers cleanup > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=b2958b640bba7edbfa8dbc9f9157cc1f48db8fd2 --- src/libbluray/bdj/bdj.c | 1 + src/libbluray/bdj/bdj_private.h | 21 ++++++++++++--------- src/libbluray/bdj/bdjo_parse.c | 1 - src/libbluray/bdj/native/bdjo.c | 2 ++ src/libbluray/bdj/native/java_awt_BDGraphics.c | 3 +-- src/libbluray/bdj/native/org_videolan_Libbluray.c | 2 ++ src/libbluray/bdj/native/org_videolan_Logger.c | 3 +-- src/libbluray/bdj/native/register_native.c | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c index 8dbaeef..47e6f60 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c @@ -35,6 +35,7 @@ #include "libbluray/register.h" #include "libbluray/bdnav/bdid_parse.h" +#include "libbluray/bdnav/index_parse.h" #include <jni.h> #include <stdio.h> diff --git a/src/libbluray/bdj/bdj_private.h b/src/libbluray/bdj/bdj_private.h index 37165ae..a6fb6e6 100644 --- a/src/libbluray/bdj/bdj_private.h +++ b/src/libbluray/bdj/bdj_private.h @@ -20,17 +20,22 @@ #ifndef BDJ_PRIVATE_H_ #define BDJ_PRIVATE_H_ -#include "libbluray/bluray.h" -#include "libbluray/bdnav/index_parse.h" -#include "libbluray/decoders/overlay.h" +#include "bdj.h" + #include <jni.h> +struct bluray; +struct bd_argb_buffer_s; +struct indx_root_s; + struct bdjava_s { - BLURAY *bd; - INDX_ROOT *index; + struct bluray *bd; - bdj_overlay_cb osd_cb; - BD_ARGB_BUFFER *buf; + const char *path; + struct indx_root_s *index; + + bdj_overlay_cb osd_cb; + struct bd_argb_buffer_s *buf; // JVM library void *h_libjvm; @@ -38,8 +43,6 @@ struct bdjava_s { // JNI JavaVM* jvm; - const char *path; - unsigned uo_mask; /* UO masks from bdjo */ }; diff --git a/src/libbluray/bdj/bdjo_parse.c b/src/libbluray/bdj/bdjo_parse.c index 74d6aa1..7ab9e7b 100644 --- a/src/libbluray/bdj/bdjo_parse.c +++ b/src/libbluray/bdj/bdjo_parse.c @@ -29,7 +29,6 @@ #include "util/bits.h" #include "util/logging.h" #include "util/macro.h" -#include "util/strutl.h" static char *_read_string(BITSTREAM* bs, uint32_t length) diff --git a/src/libbluray/bdj/native/bdjo.c b/src/libbluray/bdj/native/bdjo.c index 3d34d61..261422c 100644 --- a/src/libbluray/bdj/native/bdjo.c +++ b/src/libbluray/bdj/native/bdjo.c @@ -26,6 +26,8 @@ #include "util/logging.h" +#include <jni.h> + /* Documentation: HD Cookbook * https://hdcookbook.dev.java.net/ */ diff --git a/src/libbluray/bdj/native/java_awt_BDGraphics.c b/src/libbluray/bdj/native/java_awt_BDGraphics.c index b6ed540..92e54ae 100644 --- a/src/libbluray/bdj/native/java_awt_BDGraphics.c +++ b/src/libbluray/bdj/native/java_awt_BDGraphics.c @@ -17,14 +17,13 @@ * <http://www.gnu.org/licenses/>. */ -#include <jni.h> - #if HAVE_CONFIG_H #include "config.h" #endif #include "util/logging.h" +#include <jni.h> #include <stdint.h> #ifdef HAVE_FT2 diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c index a675c9e..14d893b 100644 --- a/src/libbluray/bdj/native/org_videolan_Libbluray.c +++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c @@ -30,6 +30,8 @@ #include "libbluray/bluray.h" #include "libbluray/bluray_internal.h" +#include "libbluray/decoders/overlay.h" +#include "libbluray/bdnav/index_parse.h" #include "util/logging.h" diff --git a/src/libbluray/bdj/native/org_videolan_Logger.c b/src/libbluray/bdj/native/org_videolan_Logger.c index 40f7e40..6b309db 100644 --- a/src/libbluray/bdj/native/org_videolan_Logger.c +++ b/src/libbluray/bdj/native/org_videolan_Logger.c @@ -17,14 +17,13 @@ * <http://www.gnu.org/licenses/>. */ -#include <jni.h> - #if HAVE_CONFIG_H #include "config.h" #endif #include "util/logging.h" +#include <jni.h> #include <stdint.h> #include "org_videolan_Logger.h" diff --git a/src/libbluray/bdj/native/register_native.c b/src/libbluray/bdj/native/register_native.c index bfbb5f5..80dfdae 100644 --- a/src/libbluray/bdj/native/register_native.c +++ b/src/libbluray/bdj/native/register_native.c @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bdj/native/register_native.h" +#include "register_native.h" #include "util/logging.h" _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
