[xine-cvs] CVS: xine-lib/src/libw32dll/DirectShow Makefile.am,1.2,1.3 inputpin.c,1.1,1.2 iunk.h,1.1,1.2

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

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

Modified Files:
	Makefile.am inputpin.c iunk.h 
Log Message:
full DirectShow support (needs testing)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/DirectShow/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/11/15 00:37:15	1.2
+++ Makefile.am	2001/11/15 14:28:18	1.3
@@ -3,12 +3,10 @@
 
 noinst_HEADERS = DS_Filter.h allocator.h cmediasample.h \
     guids.h inputpin.h interfaces.h iunk.h outputpin.h \
-    DS_AudioDecoder.h 
-# DS_VideoDecoder.h
+    DS_AudioDecoder.h DS_VideoDecoder.h
 
 libds_filter_la_SOURCES = guids.c inputpin.c outputpin.c allocator.c \
-    cmediasample.c DS_Filter.c DS_AudioDecoder.c
-# DS_VideoDecoder.c
+    cmediasample.c DS_Filter.c DS_AudioDecoder.c DS_VideoDecoder.c
 
 ##
 ##

Index: inputpin.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/DirectShow/inputpin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inputpin.c	2001/11/11 23:32:25	1.1
+++ inputpin.c	2001/11/15 14:28:18	1.2
@@ -102,10 +102,8 @@
     
     this->vt=malloc(sizeof(IEnumPins_vt));
     
-    this->pin1 = malloc(sizeof(IPin));
-    memcpy(this->pin1,p,sizeof(IPin));
-    this->pin2 = malloc(sizeof(IPin));
-    memcpy(this->pin2,pp,sizeof(IPin));
+    this->pin1 = p;
+    this->pin2 = pp;
     this->counter = 0;
     this->refcount = 1;
     
@@ -248,6 +246,8 @@
 {
     CInputPin *this;
     this = malloc(sizeof(CInputPin));
+    
+    Debug printf("CInputPin_Create %p\n", this );
 
     memcpy(&this->type,vh,sizeof(AM_MEDIA_TYPE));
     this->refcount = 1;

Index: iunk.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/DirectShow/iunk.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iunk.h	2001/11/11 23:32:25	1.1
+++ iunk.h	2001/11/15 14:28:18	1.2
@@ -4,9 +4,6 @@
 #include "guids.h"
 
 #define DECLARE_IUNKNOWN(CLASSNAME) \
-    long STDCALL (*QueryInterface)(IUnknown * This, GUID* riid, void **ppvObject); \
-    long STDCALL (*AddRef) (IUnknown * This); \
-    long STDCALL (*Release) (IUnknown * This); \
     int refcount; 
 
 #define INHERIT_IUNKNOWN() \