update win32 codec loading code

- shiny new win32 crap from avifile and mplayer!
- shiny new compilation warnings!
- use directshow filter to decode msmpeg v1/v2
- disable SYNC_SHUTDOWN ugly hack (will be removed soon, i hope)

CVS patchset: 2114
CVS date: 2002/06/21 01:44:17

1 files changed, 4 insertions, 21 deletions

diff --git a/src/libw32dll/wine/wineacm.h b/src/libw32dll/wine/wineacm.h
index e7604dc64..5984a68c5 100644
--- a/src/libw32dll/wine/wineacm.h
+++ b/src/libw32dll/wine/wineacm.h
@@ -1,19 +1,8 @@
-#ifndef WINEACM_H
-#define WINEACM_H
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
 
 /***********************************************************************
  * Wine specific - Win32
  */
-
-
-#include "msacmdrv.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-
 typedef struct _WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
 typedef struct _WINE_ACMDRIVER   *PWINE_ACMDRIVER;
 
@@ -28,7 +17,6 @@ typedef struct _WINE_ACMDRIVER
     HDRVR      		hDrvr;
     DRIVERPROC		pfnDriverProc;
     PWINE_ACMDRIVER	pNextACMDriver;
-    int                 iUsage;
 } WINE_ACMDRIVER;
 
 typedef struct _WINE_ACMSTREAM
@@ -41,8 +29,8 @@ typedef struct _WINE_ACMSTREAM
 
 typedef struct _WINE_ACMDRIVERID
 {
+    LPSTR               pszDriverAlias;
     LPSTR               pszFileName;
-    WORD		wFormatTag;
     HINSTANCE		hInstModule;          /* NULL if global */
     DWORD		dwProcessID;	      /* ID of process which installed a local driver */
     WIN_BOOL                bEnabled;
@@ -55,18 +43,13 @@ typedef struct _WINE_ACMDRIVERID
 extern HANDLE MSACM_hHeap;
 extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID;
 extern PWINE_ACMDRIVERID MSACM_pLastACMDriverID;
-
-PWINE_ACMDRIVERID MSACM_RegisterDriver(const char* pszFileName,
-				       WORD wFormatTag,
+PWINE_ACMDRIVERID MSACM_RegisterDriver(LPSTR pszDriverAlias,
+				       LPSTR pszFileName,
 				       HINSTANCE hinstModule);
+void MSACM_RegisterAllDrivers(void);
 PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p);
 void MSACM_UnregisterAllDrivers(void);
 PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID);
 PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
 PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj);
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* WINEACM_H */