[xine-cvs] CVS: xine-lib/src/dxr3 Makefile.am,1.3,1.4 dxr3_decoder.c,1.2,1.3 video_out_dxr3.c,1.3,1.4

[Eduard H. <eha...@us...>]

Update of /cvsroot/xine/xine-lib/src/dxr3
In directory usw-pr-cvs1:/tmp/cvs-serv30383/src/dxr3

Modified Files:
	Makefile.am dxr3_decoder.c video_out_dxr3.c 
Log Message:
Removed the --with-dxr3-path argument and added --disable-dxr3.
Did some cosmetic stuff too.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2001/07/24 15:02:05	1.3
+++ Makefile.am	2001/07/25 15:03:14	1.4
@@ -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_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

Index: dxr3_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/dxr3_decoder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dxr3_decoder.c	2001/07/24 15:02:05	1.2
+++ dxr3_decoder.c	2001/07/25 15:03:15	1.3
@@ -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";
 

Index: video_out_dxr3.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/video_out_dxr3.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- video_out_dxr3.c	2001/07/24 15:02:05	1.3
+++ video_out_dxr3.c	2001/07/25 15:03:15	1.4
@@ -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 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");