Module: wine Branch: refs/heads/master Commit: eb919b52636fcc18728c300c45b624dcc7d9ca9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb919b52636fcc18728c300c...
Author: Robert Reif reif@earthlink.net Date: Mon Jan 16 20:39:52 2006 +0100
dsound: Make dumpCooperativeLevel global. Remove extern from some function prototypes.
---
dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 1adb347..6645663 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -45,7 +45,7 @@ static ULONG WINAPI IDirectSound8_IUnkno static ULONG WINAPI IDirectSound8_IDirectSound_AddRef(LPDIRECTSOUND iface); static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
-static const char * dumpCooperativeLevel(DWORD level) +const char * dumpCooperativeLevel(DWORD level) { static char unknown[32]; #define LE(x) case x: return #x diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 89b00f1..efaa864 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -491,9 +491,8 @@ struct IClassFactoryImpl extern IClassFactoryImpl DSOUND_CAPTURE_CF; extern IClassFactoryImpl DSOUND_FULLDUPLEX_CF;
-void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); -void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); -void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); +/******************************************************************************* + */
/* dsound.c */
@@ -520,6 +519,9 @@ void DSOUND_ForceRemix(IDirectSoundBuffe void DSOUND_MixCancelAt(IDirectSoundBufferImpl *dsb, DWORD buf_writepos); void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq); void DSOUND_PerformMix(DirectSoundDevice *device); +void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); +void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); +void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2); void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2);
@@ -555,6 +557,7 @@ extern GUID DSOUND_renderer_guids[MAXWAV extern DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS]; extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
-extern HRESULT mmErr(UINT err); -extern void setup_dsound_options(void); -extern const char * get_device_id(LPCGUID pGuid); +HRESULT mmErr(UINT err); +void setup_dsound_options(void); +const char * get_device_id(LPCGUID pGuid); +const char * dumpCooperativeLevel(DWORD level);