Removed the --with-dxr3-path argument and added --disable-dxr3.

Did some cosmetic stuff too.

CVS patchset: 347
CVS date: 2001/07/25 15:03:14

4 files changed, 30 insertions, 34 deletions

diff --git a/m4/_xine.m4 b/m4/_xine.m4
index 0410ecad5..ffd716e19 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -64,18 +64,19 @@ AC_DEFUN(AC_LINUX_PATH,
 
 dnl AC_CHECK_DXR3()
 AC_DEFUN(AC_CHECK_DXR3,
-  [
-  AC_ARG_WITH(dxr3-path,
-   [  --with-dxr3-path=path   Where em8300.h is located],
-           em8300_path="$withval", em8300_path="$linux_path/include/linux")
- 
-  AC_CHECK_HEADER($em8300_path/em8300.h, 
-	   have_dxr3=yes
-           EM8300_INCLUDE_PATH="-I`eval echo $em8300_path`",
-           have_dxr3=no
-	   AC_MSG_RESULT(*** DXR3 support disabled ***))
-
-  AC_SUBST(EM8300_INCLUDE_PATH)
+[
+  AC_ARG_ENABLE(dxr3,
+    [  --disable-dxr3          Do not build the DXR3/HW+ plugins],,
+    enable_dxr3=yes)
+  if test x"$enable_dxr3" = xyes; then
+    AC_CHECK_HEADER($linux_path/include/linux/em8300.h, 
+         have_dxr3=yes,
+         have_dxr3=no
+         AC_MSG_RESULT(*** DXR3 support disabled due to missing em8300.h ***))
+  else
+    AC_MSG_RESULT(DXR3 plugins will not be built.)
+    have_dxr3=no
+  fi
 ])
 
 
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 906eb1c96..fb8a755e5 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ $(EM8300_INCLUDE_PATH) $(LINUX_INCLUDE)
+CFLAGS = @GLOBAL_CFLAGS@ $(LINUX_INCLUDE)
 
 EXTRA_DIST = dxr3_decoder.c video_out_dxr3.c
 
@@ -19,7 +19,7 @@ xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c
 xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
 
 debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(EM8300_INCLUDE_PATH) $(LINUX_INCLUDE)"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LINUX_INCLUDE)"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index 197c813c1..cbdfe65ad 100644
--- a/src/dxr3/dxr3_decoder.c
+++ b/src/dxr3/dxr3_decoder.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: dxr3_decoder.c,v 1.2 2001/07/24 15:02:05 f1rmb Exp $
+ * $Id: dxr3_decoder.c,v 1.3 2001/07/25 15:03:15 ehasenle Exp $
  *
  * dxr3 video and spu decoder plugin. Accepts the video and spu data
  * from XINE and sends it directly to the corresponding dxr3 devices.
@@ -26,22 +26,21 @@
  */
 
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <buffer.h>
-#include <xine_internal.h>
-#include <linux/soundcard.h>
-#include <em8300.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <inttypes.h>
+#include <errno.h>
+
+#include <linux/soundcard.h>
+#include <linux/em8300.h>
+#include "video_out.h"
+#include "xine_internal.h"
+#include "buffer.h"
 
 char devname[]="/dev/em8300";
 
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index ac7bc7934..a1af4a4a7 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.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: video_out_dxr3.c,v 1.3 2001/07/24 15:02:05 f1rmb Exp $
+ * $Id: video_out_dxr3.c,v 1.4 2001/07/25 15:03:15 ehasenle Exp $
  *
  * Dummy video out plugin for the dxr3. Is responsible for setting
  * tv_mode, bcs values and the aspectratio.
@@ -33,13 +33,9 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <em8300.h>
+#include <linux/em8300.h>
 #include "video_out.h"
-
-#include <pthread.h>
-
 #include "xine_internal.h"
-#include "utils.h"
 
 char devname[]="/dev/em8300";
 
@@ -91,7 +87,7 @@ static vo_frame_t *dxr3_alloc_frame (vo_driver_t *this_gen)
 static void dxr3_update_frame_format (vo_driver_t *this_gen,
 				      vo_frame_t *frame,
 				      uint32_t width, uint32_t height,
-				      int ratio_code, int format)
+				      int ratio_code, int format, int flags)
 {
 	/* dxr3_driver_t  *this = (dxr3_driver_t *) this_gen; */
 	fprintf(stderr, "dxr3_vo: dummy function update_frame_format called!\n");