Maarten Lankhorst : winealsa: Remove dead code.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 14 10:52:40 CDT 2007
Module: wine
Branch: master
Commit: 645f1efbc3622cb9478e8ee15880771ae82f1b2b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=645f1efbc3622cb9478e8ee15880771ae82f1b2b
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Sun May 13 12:41:52 2007 +0200
winealsa: Remove dead code.
---
dlls/winealsa.drv/dsoutput.c | 5 -----
dlls/winealsa.drv/waveout.c | 23 -----------------------
2 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index b8fbea1..1b0c550 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 d7bd6ad..786d3c1 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 */
More information about the wine-cvs
mailing list