[xine-cvs] CVS: xine-lib/src/libspudec Makefile.am,1.20,1.21 spu.c,1.62,1.63 spu.h,1.19,1.20 spu_decoder_api.h,1.33,1.34 xine_decoder.c,1.95,1.96

[James Courtier-D. <jcd...@us...>]

Update of /cvsroot/xine/xine-lib/src/libspudec
In directory sc8-pr-cvs1:/tmp/cvs-serv12493/xine-lib/src/libspudec

Modified Files:
	Makefile.am spu.c spu.h spu_decoder_api.h xine_decoder.c 
Log Message:
Update from the libdvdnav project.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.am	11 Mar 2003 15:47:05 -0000	1.20
+++ Makefile.am	29 Apr 2003 15:58:32 -0000	1.21
@@ -2,17 +2,25 @@
 
 libdir = $(XINE_PLUGINDIR)
 
+# For DVD
+if HAVE_DVDNAV
+DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+  $(DVDNAV_CFLAGS)
+link_dvdnav = $(DVDNAV_LIBS)
+else
+DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+  -I$(top_srcdir)/src/input/libdvdnav/
+link_dvdnav = $(top_srcdir)/src/input/libdvdnav/libdvdnav.la
+endif
+
 lib_LTLIBRARIES = xineplug_decode_spu.la
 XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
 
 xineplug_decode_spu_la_SOURCES = \
-	nav_read.c \
 	spu.c \
 	xine_decoder.c
 
-AM_CFLAGS = -I$(top_srcdir)/src/input/libdvdread
-
-xineplug_decode_spu_la_LIBADD = $(XINE_LIB)
+xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
 xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = spu.h

Index: spu.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/spu.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- spu.c	8 Mar 2003 14:11:53 -0000	1.62
+++ spu.c	29 Apr 2003 15:58:32 -0000	1.63
@@ -55,9 +55,14 @@
 #include "spu.h"
 #include "buffer.h"
 #include "xine-engine/bswap.h"
-#include "nav_types.h"
-#include "nav_read.h"
-#include "nav_print.h"
+#ifdef HAVE_DVDNAV
+#include <dvdnav/nav_read.h>
+#include <dvdnav/nav_print.h>
+#else
+#include "../input/libdvdnav/nav_read.h"
+#include "../input/libdvdnav/nav_print.h"
+#endif
+
 
 
 /*

Index: spu.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/spu.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- spu.h	26 Dec 2002 21:53:42 -0000	1.19
+++ spu.h	29 Apr 2003 15:58:32 -0000	1.20
@@ -35,7 +35,11 @@
 #include <inttypes.h>
 #include "video_out.h"
 #include "video_overlay.h"
-#include "nav_types.h"
+#ifdef HAVE_DVDNAV
+#include <dvdnav/nav_types.h>
+#else
+#include "../input/libdvdnav/nav_types.h"
+#endif
 
 #define NUM_SEQ_BUFFERS 50
 #define MAX_STREAMS 32

Index: spu_decoder_api.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/spu_decoder_api.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- spu_decoder_api.h	8 Mar 2003 14:11:53 -0000	1.33
+++ spu_decoder_api.h	29 Apr 2003 15:58:32 -0000	1.34
@@ -26,10 +26,10 @@
 
 #define SPU_DECODER_IFACE_VERSION 13
 
-#ifdef XINE_COMPILE
-#include "input/libdvdread/nav_types.h"
+#ifdef HAVE_DVDNAV
+#include <dvdnav/nav_types.h>
 #else
-#include "nav_types.h"
+#include "../input/libdvdnav/nav_types.h"
 #endif
 
 /*

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/xine_decoder.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- xine_decoder.c	1 Apr 2003 11:45:33 -0000	1.95
+++ xine_decoder.c	29 Apr 2003 15:58:32 -0000	1.96
@@ -37,8 +37,13 @@
 #include "xine-engine/bswap.h"
 #include "xineutils.h"
 #include "spu.h"
-#include "nav_types.h"
-#include "nav_read.h"
+#ifdef HAVE_DVDNAV
+#include <dvdnav/nav_read.h>
+#include <dvdnav/nav_types.h>
+#else
+#include "../input/libdvdnav/nav_read.h"
+#include "../input/libdvdnav/nav_types.h"
+#endif
 
 /*
 #define LOG_DEBUG 1