Francois Gouget : wineesd.drv: Move the wodDsXxx() functions around to avoid forward declarations.
Alexandre Julliard
julliard at winehq.org
Mon Mar 30 12:08:43 CDT 2009
Module: wine
Branch: master
Commit: 91d42b37ef82a85ed4081d28968a5299223e1393
URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d42b37ef82a85ed4081d28968a5299223e1393
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Sat Mar 28 11:23:18 2009 +0100
wineesd.drv: Move the wodDsXxx() functions around to avoid forward declarations.
---
dlls/wineesd.drv/audio.c | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c
index 9ba2b2a..9703d3c 100644
--- a/dlls/wineesd.drv/audio.c
+++ b/dlls/wineesd.drv/audio.c
@@ -212,9 +212,6 @@ typedef struct {
static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV];
static WINE_WAVEIN WInDev [MAX_WAVEINDRV];
-static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
-static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
-
/* These strings used only for tracing */
static const char *wodPlayerCmdString[] = {
"WINE_WM_PAUSING",
@@ -228,6 +225,28 @@ static const char *wodPlayerCmdString[] = {
"WINE_WM_STOPPING",
};
+
+/*======================================================================*
+ * Low level DSOUND implementation *
+ *======================================================================*/
+
+static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)
+{
+ /* we can't perform memory mapping as we don't have a file stream
+ interface with esd like we do with oss */
+ MESSAGE("This sound card's driver does not support direct access\n");
+ MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n");
+ return MMSYSERR_NOTSUPPORTED;
+}
+
+static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
+{
+ memset(desc, 0, sizeof(*desc));
+ strcpy(desc->szDesc, "Wine EsounD DirectSound Driver");
+ strcpy(desc->szDrvname, "wineesd.drv");
+ return MMSYSERR_NOERROR;
+}
+
/*======================================================================*
* Low level WAVE implementation *
*======================================================================*/
@@ -2071,26 +2090,6 @@ DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
return MMSYSERR_NOTSUPPORTED;
}
-/*======================================================================*
- * Low level DSOUND implementation *
- *======================================================================*/
-static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)
-{
- /* we can't perform memory mapping as we don't have a file stream
- interface with esd like we do with oss */
- MESSAGE("This sound card's driver does not support direct access\n");
- MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n");
- return MMSYSERR_NOTSUPPORTED;
-}
-
-static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
-{
- memset(desc, 0, sizeof(*desc));
- strcpy(desc->szDesc, "Wine EsounD DirectSound Driver");
- strcpy(desc->szDrvname, "wineesd.drv");
- return MMSYSERR_NOERROR;
-}
-
#else /* !HAVE_ESD */
/**************************************************************************
More information about the wine-cvs
mailing list