# HG changeset patch
# User jcdutton
# Date 1051406778 0
# Node ID 90b1f6f0520e5f68849de0701c4738d850b38d15
# Parent  330ef38ad968ee64aae9b289c6f81d6a159de402
Modified libdvdnav to do without libdvdread.
Use internal ifo tools.

diff -r 330ef38ad968 -r 90b1f6f0520e Makefile.am
--- a/Makefile.am	Sun Apr 27 00:00:49 2003 +0000
+++ b/Makefile.am	Sun Apr 27 01:26:18 2003 +0000
@@ -5,12 +5,19 @@
 
 libdvdnav_la_SOURCES = decoder.c dvdnav.c vm.c vmcmd.c \
 		       read_cache.c navigation.c highlight.c \
-		       searching.c settings.c remap.c
-libdvdnav_la_LDFLAGS = $(DVDREAD_LIBS) $(THREAD_LIBS) \
+		       searching.c settings.c remap.c \
+                       dvd_reader.c nav_read.c ifo_read.c \
+                       dvd_input.c dvd_udf.c md5.c
+
+libdvdnav_la_LIBADD = @DYNAMIC_LD_LIBS@ @CSS_LIBS@
+
+libdvdnav_la_LDFLAGS = $(THREAD_LIBS) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 #	-release $(DVDNAV_MAJOR).$(DVDNAV_MINOR).$(DVDNAV_SUB)
 
-include_HEADERS = dvdnav.h dvdnav_events.h dvd_types.h
+include_HEADERS = dvdnav.h dvdnav_events.h dvd_types.h \
+        nav_read.h dvd_reader.h ifo_types.h nav_types.h
+
 noinst_HEADERS = decoder.h dvdnav_internal.h vm.h vmcmd.h \
 	read_cache.h remap.h
 
diff -r 330ef38ad968 -r 90b1f6f0520e decoder.c
--- a/decoder.c	Sun Apr 27 00:00:49 2003 +0000
+++ b/decoder.c	Sun Apr 27 01:26:18 2003 +0000
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>  /* For memset */
-#include <dvdread/ifo_types.h> /* vm_cmd_t */
+#include "ifo_types.h" /* vm_cmd_t */
 #include <assert.h>
 #include "dvdnav_internal.h"
 
diff -r 330ef38ad968 -r 90b1f6f0520e decoder.h
--- a/decoder.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/decoder.h	Sun Apr 27 01:26:18 2003 +0000
@@ -28,7 +28,7 @@
 #include <inttypes.h>
 #include <sys/time.h>
 
-#include <dvdread/ifo_types.h> /*  vm_cmd_t */
+#include "ifo_types.h" /*  vm_cmd_t */
 #include "dvdnav_internal.h"
 
 /* link command types */
diff -r 330ef38ad968 -r 90b1f6f0520e dvd_input.c
--- a/dvd_input.c	Sun Apr 27 00:00:49 2003 +0000
+++ b/dvd_input.c	Sun Apr 27 01:26:18 2003 +0000
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <dlfcn.h>
 
 #include "dvd_reader.h"
 #include "dvd_input.h"
diff -r 330ef38ad968 -r 90b1f6f0520e dvdnav.c
--- a/dvdnav.c	Sun Apr 27 00:00:49 2003 +0000
+++ b/dvdnav.c	Sun Apr 27 01:26:18 2003 +0000
@@ -33,7 +33,7 @@
 #include "dvdnav_internal.h"
 #include "read_cache.h"
 
-#include <dvdread/nav_read.h>
+#include "nav_read.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -1090,6 +1090,10 @@
 
 /*
  * $Log$
+ * Revision 1.53  2003/04/27 01:26:18  jcdutton
+ * Modified libdvdnav to do without libdvdread.
+ * Use internal ifo tools.
+ *
  * Revision 1.52  2003/04/06 13:05:45  mroi
  * report start of PG as well
  *
diff -r 330ef38ad968 -r 90b1f6f0520e dvdnav.h
--- a/dvdnav.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/dvdnav.h	Sun Apr 27 01:26:18 2003 +0000
@@ -36,13 +36,15 @@
 #ifdef DVDNAV_COMPILE
 #  include "dvdnav_events.h"
 #  include "dvd_types.h"
+#  include "dvd_reader.h"
+#  include "ifo_types.h" /* For vm_cmd_t */
 #else
 #  include <dvdnav/dvdnav_events.h>
 #  include <dvdnav/dvd_types.h>
+#  include <dvdnav/dvd_reader.h>
+#  include <dvdnav/ifo_types.h> /* For vm_cmd_t */
 #endif
 
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_types.h> /* For vm_cmd_t */
 
 
 /*********************************************************************
diff -r 330ef38ad968 -r 90b1f6f0520e dvdnav_events.h
--- a/dvdnav_events.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/dvdnav_events.h	Sun Apr 27 01:26:18 2003 +0000
@@ -28,9 +28,9 @@
 #ifndef DVDNAV_EVENTS_H_INCLUDED
 #define DVDNAV_EVENTS_H_INCLUDED
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
-#include <dvdread/nav_types.h>
+#include "ifo_types.h"
+#include "dvd_reader.h"
+#include "nav_types.h"
 
 
 /*
diff -r 330ef38ad968 -r 90b1f6f0520e dvdnav_internal.h.in
--- a/dvdnav_internal.h.in	Sun Apr 27 00:00:49 2003 +0000
+++ b/dvdnav_internal.h.in	Sun Apr 27 01:26:18 2003 +0000
@@ -37,9 +37,9 @@
 
 @BIGENDIAN@
 
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/ifo_types.h>
+#include "dvd_reader.h"
+#include "ifo_read.h"
+#include "ifo_types.h"
 
 /* Uncomment for VM command tracing */
 /* #define TRACE */
diff -r 330ef38ad968 -r 90b1f6f0520e highlight.c
--- a/highlight.c	Sun Apr 27 00:00:49 2003 +0000
+++ b/highlight.c	Sun Apr 27 01:26:18 2003 +0000
@@ -26,7 +26,7 @@
 #endif
 
 #include <assert.h>
-#include <dvdread/nav_types.h>
+#include "nav_types.h"
 #include "dvdnav_internal.h"
 
 /*
@@ -35,7 +35,7 @@
 
 #ifdef BUTTON_TESTING
 
-#include <dvdread/nav_print.h>
+#include "nav_print.h"
 
 static void print_time(dvd_time_t *dtime) {
   const char *rate;
diff -r 330ef38ad968 -r 90b1f6f0520e ifo_print.h
--- a/ifo_print.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/ifo_print.h	Sun Apr 27 01:26:18 2003 +0000
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include "ifo_types.h"
+#include "dvd_reader.h"
 
 #ifdef __cplusplus
 extern "C" {
diff -r 330ef38ad968 -r 90b1f6f0520e ifo_read.h
--- a/ifo_read.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/ifo_read.h	Sun Apr 27 01:26:18 2003 +0000
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include "ifo_types.h"
+#include "dvd_reader.h"
 
 #ifdef __cplusplus
 extern "C" {
diff -r 330ef38ad968 -r 90b1f6f0520e ifo_types.h
--- a/ifo_types.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/ifo_types.h	Sun Apr 27 01:26:18 2003 +0000
@@ -21,7 +21,7 @@
  */
 
 #include <inttypes.h>
-#include <dvdread/dvd_reader.h>
+#include "dvd_reader.h"
 
 
 #undef ATTRIBUTE_PACKED
diff -r 330ef38ad968 -r 90b1f6f0520e nav_print.h
--- a/nav_print.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/nav_print.h	Sun Apr 27 01:26:18 2003 +0000
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/nav_types.h>
+#include "nav_types.h"
 
 /**
  * Pretty printing of the NAV packets, PCI and DSI structs.
diff -r 330ef38ad968 -r 90b1f6f0520e nav_read.h
--- a/nav_read.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/nav_read.h	Sun Apr 27 01:26:18 2003 +0000
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/nav_types.h>
+#include "nav_types.h"
 
 /**
  * Parsing of NAV data, PCI and DSI parts.
diff -r 330ef38ad968 -r 90b1f6f0520e nav_types.h
--- a/nav_types.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/nav_types.h	Sun Apr 27 01:26:18 2003 +0000
@@ -30,7 +30,7 @@
  */
 
 #include <inttypes.h>
-#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
+#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */
 
 
 #undef ATTRIBUTE_PACKED
diff -r 330ef38ad968 -r 90b1f6f0520e vm.c
--- a/vm.c	Sun Apr 27 00:00:49 2003 +0000
+++ b/vm.c	Sun Apr 27 01:26:18 2003 +0000
@@ -37,8 +37,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/ifo_read.h>
+#include "ifo_types.h"
+#include "ifo_read.h"
 
 #include "dvdnav_internal.h"
 
@@ -1841,6 +1841,10 @@
 
 /*
  * $Log$
+ * Revision 1.58  2003/04/27 01:26:18  jcdutton
+ * Modified libdvdnav to do without libdvdread.
+ * Use internal ifo tools.
+ *
  * Revision 1.57  2003/04/21 13:24:31  mroi
  * some code beautification:
  * * rename vm_resume to vm_jump_resume for consistency's sake
diff -r 330ef38ad968 -r 90b1f6f0520e vmcmd.h
--- a/vmcmd.h	Sun Apr 27 00:00:49 2003 +0000
+++ b/vmcmd.h	Sun Apr 27 01:26:18 2003 +0000
@@ -26,7 +26,7 @@
 #define VMCMD_H_INCLUDED
 
 #include <inttypes.h>
-#include <dvdread/ifo_types.h> /*  Only for vm_cmd_t  */
+#include "ifo_types.h" /*  Only for vm_cmd_t  */
 #include "dvdnav_internal.h"
 
 #ifdef TRACE