Changed loads of #include <dvdread/...> to #include <...>

CVS patchset: 2405
CVS date: 2002/08/08 21:55:54

18 files changed, 42 insertions, 39 deletions

diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am
index cf30e12e4..f8206c12b 100644
--- a/src/input/libdvdnav/Makefile.am
+++ b/src/input/libdvdnav/Makefile.am
@@ -1,6 +1,5 @@
 DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-  -Ilibdvdnav/ \
-  -Ilibdvdread/
+  -I../libdvdread/
 
 CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
 
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index 8e177b49d..e5e64d0d7 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.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: decoder.c,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: decoder.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -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 "vmcmd.h"
 #include "decoder.h"
diff --git a/src/input/libdvdnav/decoder.h b/src/input/libdvdnav/decoder.h
index e977ac90f..17e2a9199 100644
--- a/src/input/libdvdnav/decoder.h
+++ b/src/input/libdvdnav/decoder.h
@@ -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: decoder.h,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: decoder.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -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 */
 
 /* Uncomment for tracing */
 /* #define TRACE  */
diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c
index 63282db69..17240e173 100644
--- a/src/input/libdvdnav/dvdnav.c
+++ b/src/input/libdvdnav/dvdnav.c
@@ -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: dvdnav.c,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: dvdnav.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -34,7 +34,7 @@
 #include "dvdnav_internal.h"
 #include "read_cache.h"
 
-#include <dvdread/nav_read.h>
+#include <nav_read.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -995,6 +995,9 @@ uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) {
 
 /*
  * $Log: dvdnav.c,v $
+ * Revision 1.2  2002/08/08 21:55:54  richwareham
+ * Changed loads of #include <dvdread/...> to #include <...>
+ *
  * Revision 1.1  2002/08/08 17:49:21  richwareham
  * First stage of DVD plugin -> dvdnav conversion
  *
diff --git a/src/input/libdvdnav/dvdnav.h b/src/input/libdvdnav/dvdnav.h
index 4d03341cc..3f84614ea 100644
--- a/src/input/libdvdnav/dvdnav.h
+++ b/src/input/libdvdnav/dvdnav.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: dvdnav.h,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: dvdnav.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -40,7 +40,7 @@ extern "C" {
 /* Various useful types */
 #include "dvd_types.h"
 
-#include <dvdread/dvd_reader.h>
+#include <dvd_reader.h>
 
 /**
  * Opaque data-type can be viewed as a 'DVD handle'. You should get
diff --git a/src/input/libdvdnav/dvdnav_events.h b/src/input/libdvdnav/dvdnav_events.h
index 427c7896c..9349b4367 100644
--- a/src/input/libdvdnav/dvdnav_events.h
+++ b/src/input/libdvdnav/dvdnav_events.h
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dvdnav_events.h,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: dvdnav_events.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
 #ifndef DVDNAV_EVENTS_H_INCLUDED
 #define DVDNAV_EVENTS_H_INCLUDED
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/nav_types.h>
-#include <dvdread/dvd_reader.h>
+#include <ifo_types.h>
+#include <nav_types.h>
+#include <dvd_reader.h>
 
 /**
  * \file dvdnav_events.h
diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h
index 8b589af77..58177b50f 100644
--- a/src/input/libdvdnav/dvdnav_internal.h
+++ b/src/input/libdvdnav/dvdnav_internal.h
@@ -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: dvdnav_internal.h,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: dvdnav_internal.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -41,9 +41,9 @@
 
 #undef WORDS_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>
 
 
 /* Maximum length of an error string */
diff --git a/src/input/libdvdnav/highlight.c b/src/input/libdvdnav/highlight.c
index dc4f3877a..3803bccb9 100644
--- a/src/input/libdvdnav/highlight.c
+++ b/src/input/libdvdnav/highlight.c
@@ -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: highlight.c,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: highlight.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -35,10 +35,10 @@
 
 #include "vm.h"
 #
-#include <dvdread/nav_types.h>
+#include <nav_types.h>
 
 #ifdef BUTTON_TESTING
-#include <dvdread/nav_print.h>
+#include <nav_print.h>
 #endif
 
 /* Highlighting API calls */
diff --git a/src/input/libdvdnav/searching.c b/src/input/libdvdnav/searching.c
index 43ac770f4..7b34119d3 100644
--- a/src/input/libdvdnav/searching.c
+++ b/src/input/libdvdnav/searching.c
@@ -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: searching.c,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: searching.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -29,7 +29,7 @@
 #include "dvdnav_internal.h"
 
 #include "vm.h"
-#include <dvdread/nav_types.h>
+#include <nav_types.h>
 
 /* Searching API calls */
 
diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c
index ec4ac75fe..7d56fd6b5 100644
--- a/src/input/libdvdnav/vm.c
+++ b/src/input/libdvdnav/vm.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: vm.c,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: vm.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -34,8 +34,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/ifo_read.h>
+#include <ifo_types.h>
+#include <ifo_read.h>
 
 #include "decoder.h"
 #include "vmcmd.h"
@@ -1798,6 +1798,9 @@ static pgcit_t* get_PGCIT(vm_t *vm) {
 
 /*
  * $Log: vm.c,v $
+ * Revision 1.2  2002/08/08 21:55:54  richwareham
+ * Changed loads of #include <dvdread/...> to #include <...>
+ *
  * Revision 1.1  2002/08/08 17:49:21  richwareham
  * First stage of DVD plugin -> dvdnav conversion
  *
diff --git a/src/input/libdvdnav/vmcmd.h b/src/input/libdvdnav/vmcmd.h
index c4079f245..23f267a69 100644
--- a/src/input/libdvdnav/vmcmd.h
+++ b/src/input/libdvdnav/vmcmd.h
@@ -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: vmcmd.h,v 1.1 2002/08/08 17:49:21 richwareham Exp $
+ * $Id: vmcmd.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
  *
  */
 
@@ -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 "decoder.h"
 
 void vmPrint_mnemonic(vm_cmd_t *command);
diff --git a/src/input/libdvdread/Makefile.am b/src/input/libdvdread/Makefile.am
index 2bb8c9f1c..1af16b768 100644
--- a/src/input/libdvdread/Makefile.am
+++ b/src/input/libdvdread/Makefile.am
@@ -1,6 +1,4 @@
-DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-  -Ilibdvdnav/ \
-  -Ilibdvdread/
+DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE 
 
 CFLAGS = @CFLAGS@ $(DVD_CFLAGS) 
 
diff --git a/src/input/libdvdread/ifo_print.h b/src/input/libdvdread/ifo_print.h
index 871bc7362..a5489bd53 100644
--- a/src/input/libdvdread/ifo_print.h
+++ b/src/input/libdvdread/ifo_print.h
@@ -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 --git a/src/input/libdvdread/ifo_read.h b/src/input/libdvdread/ifo_read.h
index dcf65a347..a4cfd02e6 100644
--- a/src/input/libdvdread/ifo_read.h
+++ b/src/input/libdvdread/ifo_read.h
@@ -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 --git a/src/input/libdvdread/ifo_types.h b/src/input/libdvdread/ifo_types.h
index 1fd5c64b1..462800bd1 100644
--- a/src/input/libdvdread/ifo_types.h
+++ b/src/input/libdvdread/ifo_types.h
@@ -21,7 +21,7 @@
  */
 
 #include <inttypes.h>
-#include <dvdread/dvd_reader.h>
+#include <dvd_reader.h>
 
 
 #undef ATTRIBUTE_PACKED
diff --git a/src/input/libdvdread/nav_print.h b/src/input/libdvdread/nav_print.h
index 28aefc7e5..876f4dd16 100644
--- a/src/input/libdvdread/nav_print.h
+++ b/src/input/libdvdread/nav_print.h
@@ -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>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/input/libdvdread/nav_read.h b/src/input/libdvdread/nav_read.h
index 61a11ea55..96119cb0f 100644
--- a/src/input/libdvdread/nav_read.h
+++ b/src/input/libdvdread/nav_read.h
@@ -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>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/input/libdvdread/nav_types.h b/src/input/libdvdread/nav_types.h
index bb74e29ed..3450f8272 100644
--- a/src/input/libdvdread/nav_types.h
+++ b/src/input/libdvdread/nav_types.h
@@ -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