From 645f1efbc3622cb9478e8ee15880771ae82f1b2b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Sun, 13 May 2007 12:41:52 +0200 Subject: [PATCH] winealsa: Remove dead code. --- dlls/winealsa.drv/dsoutput.c | 5 ----- dlls/winealsa.drv/waveout.c | 23 ----------------------- 2 files changed, 28 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index b8fbea1c288..1b0c5507c64 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -421,11 +421,6 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, if (wwo->hw_params == NULL || wwo->pcm == NULL) return DSERR_GENERIC; -#if 0 /* Shouldn't be needed */ - /* we need to track down buffer underruns */ - DSDB_CheckXRUN(This); -#endif - state = snd_pcm_state(wwo->pcm); if (state == SND_PCM_STATE_RUNNING) { diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index d7bd6ad5e59..786d3c18caf 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -276,21 +276,6 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) * - we hit the beginning of a running loop * - we hit a wavehdr which hasn't finished playing */ -#if 0 - while ((lpWaveHdr = wwo->lpQueuePtr) && - (force || - (lpWaveHdr != wwo->lpPlayPtr && - lpWaveHdr != wwo->lpLoopPtr && - lpWaveHdr->reserved <= wwo->dwPlayedTotal))) { - - wwo->lpQueuePtr = lpWaveHdr->lpNext; - - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; - lpWaveHdr->dwFlags |= WHDR_DONE; - - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); - } -#else for (;;) { lpWaveHdr = wwo->lpQueuePtr; @@ -308,7 +293,6 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); } -#endif return (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != wwo->lpLoopPtr) ? wodPlayer_NotifyWait(wwo, lpWaveHdr) : INFINITE; } @@ -499,13 +483,6 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEDEV* wwo) wodUpdatePlayedTotal(wwo, NULL); availInQ = snd_pcm_avail_update(wwo->pcm); -#if 0 - /* input queue empty and output buffer with less than one fragment to play */ - if (!wwo->lpPlayPtr && wwo->dwBufferSize < availInQ + wwo->dwFragmentSize) { - TRACE("Run out of wavehdr:s...\n"); - return INFINITE; - } -#endif /* no more room... no need to try to feed */ if (availInQ > 0) { /* Feed from partial wavehdr */ -- 2.11.4.GIT