* Win32 compilation fixes (mingw includes dirent)
* configure now checks for ddraw.h and not directx.h
* vout_directx doesn't include directx.h anymore (this file isn't part of
    the directx sdk)
* moved all the stuff from aout_waveout.c directly into waveout.c (I don't
    know what I was thinking about when I created these two files ;-)
* until we fix the audio buffer underrun problem, waveout will be the
    default audio output on win32 (instead of directx).

configure

@@ -7238,7 +7238,7 @@ fi
 
     if test "x$with_directx_path" = "x"
     then
-      for ac_hdr in directx.h
+      for ac_hdr in ddraw.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -7282,7 +7282,7 @@ done
     else
       echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
 echo "configure:7285: checking for directX headers in ${withval}" >&5
-      if test -f ${withval}/include/directx.h
+      if test -f ${withval}/include/ddraw.h
       then
         PLUGINS="${PLUGINS} directx"
         LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"

configure.in

@@ -1178,12 +1178,12 @@ then
     [  --with-directx-path=path Win32 DirectX headers and libraries])
     if test "x$with_directx_path" = "x"
     then
-      AC_CHECK_HEADERS(directx.h,
+      AC_CHECK_HEADERS(ddraw.h,
       [ PLUGINS="${PLUGINS} directx"
         LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ])
     else
       AC_MSG_CHECKING(for directX headers in ${withval})
-      if test -f ${withval}/include/directx.h
+      if test -f ${withval}/include/ddraw.h
       then
         PLUGINS="${PLUGINS} directx"
         LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"

plugins/directx/aout_directx.c

@@ -2,7 +2,7 @@
  * aout_directx.c: Windows DirectX audio output method
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aout_directx.c,v 1.17 2002/02/15 13:32:53 sam Exp $
+ * $Id: aout_directx.c,v 1.18 2002/02/15 20:02:21 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -33,11 +33,8 @@
 
 #include <videolan/vlc.h>
 
-#if defined( _MSC_VER )
-#   include <dsound.h>
-#else
-#   include <directx.h>
-#endif
+#include <mmsystem.h>
+#include <dsound.h>
 
 #include "audio_output.h"                                   /* aout_thread_t */
 

plugins/directx/vout_directx.c

@@ -2,7 +2,7 @@
  * vout_directx.c: Windows DirectX video output display method
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_directx.c,v 1.21 2002/02/15 13:32:53 sam Exp $
+ * $Id: vout_directx.c,v 1.22 2002/02/15 20:02:21 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -45,9 +45,6 @@
 
 #include <videolan/vlc.h>
 
-#include <windows.h>
-#include <windowsx.h>
-
 #include <ddraw.h>
 
 #include "netutils.h"

plugins/gtk/gtk_playlist.c

@@ -2,7 +2,7 @@
  * gtk_playlist.c : Interface for the playlist dialog
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: gtk_playlist.c,v 1.29 2002/02/15 13:32:53 sam Exp $
+ * $Id: gtk_playlist.c,v 1.30 2002/02/15 20:02:21 gbazin Exp $
  *
  * Authors: Pierre Baillet <oct@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -32,7 +32,8 @@
 
 #include <sys/types.h>          /* for readdir  and stat stuff */
 
-#if !defined( WIN32 )
+#if (!defined( WIN32 ) || defined(__MINGW32__))
+/* Mingw has its own version of dirent */
 #   include <dirent.h>
 #endif
 

plugins/win32/Makefile

 win32_SRC = win32.cpp
-waveout_SOURCES = waveout.c aout_waveout.c
+waveout_SOURCES = waveout.c