Try to get xine-lib to compile.

CVS patchset: 2682
CVS date: 2002/09/18 06:42:23

4 files changed, 14 insertions, 10 deletions

diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 2aa90b5a7..8d97eb4d2 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,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: input_dvd.c,v 1.84 2002/09/18 04:20:09 jcdutton Exp $
+ * $Id: input_dvd.c,v 1.85 2002/09/18 06:42:23 jcdutton Exp $
  *
  */
 
@@ -66,11 +66,6 @@
 #warning "This might not compile due to missing cdrom ioctls"
 #endif
 
-/* Xine includes */
-#include "xineutils.h"
-#include "buffer.h"
-#include "xine_internal.h"
-
 /* DVDNAV includes */
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/dvdnav.h>
@@ -81,6 +76,11 @@
 /* libdvdread includes */
 #include "nav_read.h"
 
+/* Xine includes */
+#include "xineutils.h"
+#include "buffer.h"
+#include "xine_internal.h"
+
 /* Print debug messages? */
 #define INPUT_DEBUG
 
@@ -1527,6 +1527,9 @@ static void *init_input_plugin (xine_t *xine, void *data) {
 
 /*
  * $Log: input_dvd.c,v $
+ * Revision 1.85  2002/09/18 06:42:23  jcdutton
+ * Try to get xine-lib to compile.
+ *
  * Revision 1.84  2002/09/18 04:20:09  jcdutton
  * Updating the DVD menu code to use better nav_pci information.
  * libspudec parses nav_pci info correctly.
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index c4b3e308f..796569eea 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -8,8 +8,8 @@ xineplug_decode_spu_la_SOURCES =  spu.c xine_decoder.c nav_read.c nav_print.c
 xineplug_decode_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_decode_spu_la_LDFLAGS = -avoid-version -module
 
-noinst_HEADERS = spu.h nav_read.h bswap.h nav_print.h nav_types.h
-include_HEADERS = spu_decoder_api.h
+noinst_HEADERS = spu.h nav_read.h bswap.h nav_print.h
+include_HEADERS = spu_decoder_api.h nav_types.h
 
 ##
 ## Install header files (default=$includedir/xine)
diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h
index 19575a505..cc42fff65 100644
--- a/src/libspudec/spu_decoder_api.h
+++ b/src/libspudec/spu_decoder_api.h
@@ -27,7 +27,7 @@
 #define SPU_DECODER_IFACE_VERSION 9
 /* FIXME: Needed for spu_button_t */
 /* But will not be on all users's systems. (From the libspudec directory or libdvdread). */
-#include <nav_types.h>
+//#include "nav_types.h"
 
 /*
  * generic xine spu decoder plugin interface
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 1e8fed0bf..40cc188c0 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,7 +17,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_internal.h,v 1.100 2002/09/18 00:51:34 guenter Exp $
+ * $Id: xine_internal.h,v 1.101 2002/09/18 06:42:23 jcdutton Exp $
  *
  */
 
@@ -55,6 +55,7 @@ extern "C" {
 #include "lrb.h"
 
 #ifdef XINE_COMPILE
+#include "libspudec/nav_types.h"
 #include "libspudec/spu_decoder_api.h"
 #else
 #include "spu_decoder_api.h"