[MPlayer-cvslog] r26938 - in trunk/stream: stream_dvd.h stream_dvd_common.c stream_dvd_common.h

[nicodvb]

Author: nicodvb
Date: Sat May 31 14:52:55 2008
New Revision: 26938

Log:
adapted to the dvdread->libdvdread transition in dvdnav's repository

Modified:
   trunk/stream/stream_dvd.h
   trunk/stream/stream_dvd_common.c
   trunk/stream/stream_dvd_common.h

Modified: trunk/stream/stream_dvd.h
==============================================================================
--- trunk/stream/stream_dvd.h	(original)
+++ trunk/stream/stream_dvd.h	Sat May 31 14:52:55 2008
@@ -8,10 +8,10 @@
 #include "dvdread/ifo_read.h"
 #include "dvdread/nav_read.h"
 #else
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_types.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/nav_read.h>
+#include <libdvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/ifo_read.h>
+#include <libdvdread/nav_read.h>
 #endif
 #include "stream.h"
 

Modified: trunk/stream/stream_dvd_common.c
==============================================================================
--- trunk/stream/stream_dvd_common.c	(original)
+++ trunk/stream/stream_dvd_common.c	Sat May 31 14:52:55 2008
@@ -1,5 +1,9 @@
 #include <inttypes.h>
+#ifdef USE_DVDREAD_INTERNAL
 #include <dvdread/ifo_types.h>
+#else
+#include <libdvdread/ifo_types.h>
+#endif
 #include "stream_dvd_common.h"
 
 /** 

Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h	(original)
+++ trunk/stream/stream_dvd_common.h	Sat May 31 14:52:55 2008
@@ -2,7 +2,11 @@
 #define MPLAYER_STREAM_DVD_COMMON_H
 
 #include <inttypes.h>
+#ifdef USE_DVDREAD_INTERNAL
 #include <dvdread/ifo_types.h>
+#else
+#include <libdvdread/ifo_types.h>
+#endif
 
 int mp_dvdtimetomsec(dvd_time_t *dt);