Update from the libdvdnav project.

CVS patchset: 4708
CVS date: 2003/04/29 15:58:27

5 files changed, 38 insertions, 16 deletions

diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 0aedf2772..a9114356a 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -2,17 +2,25 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 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
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c
index 2b6f45841..ceb803032 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spu.c
@@ -35,7 +35,7 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: spu.c,v 1.62 2003/03/08 14:11:53 mroi Exp $
+ * $Id: spu.c,v 1.63 2003/04/29 15:58:32 jcdutton Exp $
  *
  */
 
@@ -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
+
 
 
 /*
diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h
index 79bec4fe5..e727991eb 100644
--- a/src/libspudec/spu.h
+++ b/src/libspudec/spu.h
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: spu.h,v 1.19 2002/12/26 21:53:42 miguelfreitas Exp $
+ * $Id: spu.h,v 1.20 2003/04/29 15:58:32 jcdutton Exp $
  *
  * This file was originally part of the OMS program.
  *
@@ -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
diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h
index 4bd725338..3a31c3374 100644
--- a/src/libspudec/spu_decoder_api.h
+++ b/src/libspudec/spu_decoder_api.h
@@ -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
 
 /*
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index 2fa5d9fb1..04f4e5bb2 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.95 2003/04/01 11:45:33 jcdutton Exp $
+ * $Id: xine_decoder.c,v 1.96 2003/04/29 15:58:32 jcdutton Exp $
  *
  * stuff needed to turn libspu into a xine decoder plugin
  */
@@ -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