Mercurial > libdvdnav.hg

changeset 169:90b1f6f0520e src

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified libdvdnav to do without libdvdread. Use internal ifo tools.
author jcdutton
date Sun, 27 Apr 2003 01:26:18 +0000
parents 330ef38ad968
children 43c88a901c4c
files Makefile.am decoder.c decoder.h dvd_input.c dvdnav.c dvdnav.h dvdnav_events.h dvdnav_internal.h.in highlight.c ifo_print.h ifo_read.h ifo_types.h nav_print.h nav_read.h nav_types.h vm.c vmcmd.h
diffstat 17 files changed, 45 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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"
 
--- 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 */
--- 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"
--- 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
  *
--- 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 */
 
 
 /*********************************************************************
--- 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"
 
 
 /*
--- 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 */
--- 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;
--- 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" {
--- 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" {
--- 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
--- 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.
--- 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.
--- 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
--- 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
--- 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