[xine-cvs] CVS: xine-lib/src/libw32dll Makefile.am,1.15,1.16 w32codec.c,1.53,1.54

[Miguel F. <mig...@us...>]

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

Modified Files:
	Makefile.am w32codec.c 
Log Message:
updating directshow support with avifile/mplayer changes


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am	2001/11/16 20:44:54	1.15
+++ Makefile.am	2002/01/06 18:56:19	1.16
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
+CFLAGS = @GLOBAL_CFLAGS@ -Iwine
 
 SUBDIRS = wine DirectShow
 
@@ -28,7 +28,7 @@
 	@list='$(SUBDIRS)'; for subdir in $$list; do \
 	  (cd $$subdir && $(MAKE) $@) || exit;\
 	done;
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -Iwine"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

Index: w32codec.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/w32codec.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- w32codec.c	2002/01/05 21:54:17	1.53
+++ w32codec.c	2002/01/06 18:56:19	1.54
@@ -468,7 +468,6 @@
 static void w32v_init_ds_codec (w32v_decoder_t *this, int buf_type) {
   uint32_t vo_cap;
   int outfmt;
-  CodecInfo ci;
 
   printf ("w32codec: init Direct Show video codec...\n");
   
@@ -477,9 +476,8 @@
 
   this->ldt_fs = Setup_LDT_Keeper();
   
-  ci.dll=win32_codec_name;
-  memcpy(&ci.guid,this->guid,sizeof(ci.guid));
-  this->ds_dec = DS_VideoDecoder_Create(&ci, &this->bih, this->flipped, 0);
+  this->ds_dec = DS_VideoDecoder_Open(win32_codec_name, this->guid,
+                                        &this->bih, this->flipped, 0);
   
   if(!this->ds_dec){
     printf ("w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n",
@@ -606,10 +604,8 @@
 			 &this->bih, this->buf,
 			 &this->o_bih, this->img_buffer);
       else {
-        CImage image;
-        image.ptr=this->img_buffer;
         ret = DS_VideoDecoder_DecodeInternal(this->ds_dec, this->buf, 
-                         this->size, 0, &image);
+                         this->size, 0, this->img_buffer);
       }
                          
       if (this->outfmt==IMGFMT_YUY2) {
@@ -871,16 +867,9 @@
     acmStreamSize(this->srcstream, out_size, (LPDWORD) &this->rec_audio_src_size, 
       ACM_STREAMSIZEF_DESTINATION);
   } else {
-    CodecInfo ci;
-       
-    ci.dll=win32_codec_name;
-    memcpy(&ci.guid,this->guid,sizeof(GUID));
     
-    /*__asm__ __volatile__(
-	   "int $0x3\n" : : 
-    	);*/
-
-    if( (this->ds_dec=DS_AudioDecoder_Create(&ci, in_fmt)) == NULL ) {
+    if( (this->ds_dec=DS_AudioDecoder_Open(win32_codec_name,
+                                           this->guid, in_fmt)) == NULL ) {
       printf("w32codec: Error initializing DirectShow Audio\n");
       this->srcstream = 0;
       return 0;