CVS Commit: vlc

[Gildas Bazin]

On Sat, 02 Jun 2001 02:09:03 cvs at videolan.org wrote:
>
>     Notes: o I called it 'directx' instead of 'windx' because it
>              made a lot more sense to me.
>
>            o Completely untested. I didn't manage to compile it yet.

I have to agree on this, it hasn't been much tested yet. As I already said
when I sent the patch for this plugin, I'm sure it is buggy and I already
know about a few of these bugs... but nevertheless, this plugin has been
working without too many problems on my computer (and in my opinion it's
working better than the SDL output on my PC).

Attached to this mail is a little patch which will fix the compilation
issues that you've got (at least it's compiling again on my machine), but I
haven't had time to test it on Windows so it may not work yet (especially,
I'm not sure I should use the -fnative-struct flag to compile this plugin).
I will spend the little free time I've got this week-end to try to fix the
issues I know about.


Thanks for putting this plugin into the cvs.

--
Gildas

-- Attached file included as plaintext by Listar --

Index: Makefile.modules
===================================================================
RCS file: /var/cvs/videolan/vlc/Makefile.modules,v
retrieving revision 1.2
diff -u -r1.2 Makefile.modules
--- Makefile.modules	2001/05/30 17:03:11	1.2
+++ Makefile.modules	2001/06/02 08:31:24
@@ -13,7 +13,11 @@
 #
 # C compiler flags: plugin compilation
 #
+ifneq (,$(findstring mingw32,$(SYS)))
+PCFLAGS += -fPIC -fnative-struct
+else
 PCFLAGS += -fPIC
+endif
 
 #
 # C compiler flags: plugin linking
Index: Makefile.opts.in
===================================================================
RCS file: /var/cvs/videolan/vlc/Makefile.opts.in,v
retrieving revision 1.13
diff -u -r1.13 Makefile.opts.in
--- Makefile.opts.in	2001/06/02 01:09:03	1.13
+++ Makefile.opts.in	2001/06/02 08:31:24
@@ -170,6 +170,10 @@
 CFLAGS += -traditional-cpp
 endif
 
+ifneq (,$(findstring mingw32,$(SYS)))                                                                     
+CFLAGS += -fnative-struct
+endif
+
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
 CFLAGS += -O3
Index: plugins/directx/aout_directx.c
===================================================================
RCS file: /var/cvs/videolan/vlc/plugins/directx/aout_directx.c,v
retrieving revision 1.1
diff -u -r1.1 aout_directx.c
--- plugins/directx/aout_directx.c	2001/06/02 01:09:03	1.1
+++ plugins/directx/aout_directx.c	2001/06/02 08:31:25
@@ -57,6 +57,7 @@
 #include "main.h"
 
 #include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
  * aout_sys_t: directx audio output method descriptor
Index: plugins/directx/vout_directx.c
===================================================================
RCS file: /var/cvs/videolan/vlc/plugins/directx/vout_directx.c,v
retrieving revision 1.1
diff -u -r1.1 vout_directx.c
--- plugins/directx/vout_directx.c	2001/06/02 01:09:03	1.1
+++ plugins/directx/vout_directx.c	2001/06/02 08:31:26
@@ -864,7 +864,7 @@
                                              ddsd.lpSurface );
         /* FIXME: palette in 8bpp ?? */
         /* Set and initialize buffers */
-        vout_SetBuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
+        p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
                                  p_vout->p_sys->p_windx_buf[ 1 ] );
     }
     else
@@ -902,7 +902,7 @@
         dxresult = IDirectDrawSurface_Unlock(p_vout->p_sys->p_overlay,
                                              ddsd.lpSurface );
 
-        vout_SetBuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
+        p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
                                  p_vout->p_sys->p_windx_buf[ 1 ] );
     }