ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More robust and less time consuming playback.

This commit is contained in:
Eric Pouech 2002-04-01 21:02:49 +00:00 committed by Alexandre Julliard
parent 3209f949b3
commit a1e57324e4
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/winmm/wineoss/audio.c
View File

@ -716,23 +716,30 @@ static DWORD wodPlayer_NotifyWait(const WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr)
/************************************************************************** /**************************************************************************
* wodPlayer_WriteMaxFrags [internal] * wodPlayer_WriteMaxFrags [internal]
* Writes the maximum number of bytes possible to the DSP and returns * Writes the maximum number of bytes possible to the DSP and returns
* the number of bytes written. * TRUE iff the current playPtr has been fully played
*/ */
static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo, DWORD* bytes) static BOOL wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo, DWORD* bytes)
{ {
/* Only attempt to write to free bytes */ DWORD dwLength = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset;
DWORD dwLength = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset; DWORD toWrite = min(dwLength, *bytes);
int toWrite = min(dwLength, *bytes); int written;
int written; BOOL ret = FALSE;
TRACE("Writing wavehdr %p.%lu[%lu]\n", TRACE("Writing wavehdr %p.%lu[%lu]/%lu\n",
wwo->lpPlayPtr, wwo->dwPartialOffset, wwo->lpPlayPtr->dwBufferLength); wwo->lpPlayPtr, wwo->dwPartialOffset, wwo->lpPlayPtr->dwBufferLength, toWrite);
written = write(wwo->unixdev, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toWrite);
if (written <= 0) return written; if (toWrite > 0)
{
written = write(wwo->unixdev, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toWrite);
if (written <= 0) return FALSE;
}
else
written = 0;
if (written >= dwLength) { if (written >= dwLength) {
/* If we wrote all current wavehdr, skip to the next one */ /* If we wrote all current wavehdr, skip to the next one */
wodPlayer_PlayPtrNext(wwo); wodPlayer_PlayPtrNext(wwo);
ret = TRUE;
} else { } else {
/* Remove the amount written */ /* Remove the amount written */
wwo->dwPartialOffset += written; wwo->dwPartialOffset += written;
@ -740,7 +747,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo, DWORD* bytes)
*bytes -= written; *bytes -= written;
wwo->dwWrittenTotal += written; wwo->dwWrittenTotal += written;
return written; return ret;
} }
@ -937,7 +944,8 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEOUT* wwo)
/* input queue empty and output buffer with less than one fragment to play */ /* input queue empty and output buffer with less than one fragment to play */
if (!wwo->lpPlayPtr && wwo->dwBufferSize < availInQ + 2 * wwo->dwFragmentSize) { if (!wwo->lpPlayPtr && wwo->dwBufferSize < availInQ + 2 * wwo->dwFragmentSize) {
TRACE("Run out of wavehdr:s... flushing\n"); TRACE("Run out of wavehdr:s... flushing (%lu => %lu)\n",
wwo->dwPlayedTotal, wwo->dwWrittenTotal);
ioctl(wwo->unixdev, SNDCTL_DSP_SYNC, 0); ioctl(wwo->unixdev, SNDCTL_DSP_SYNC, 0);
wwo->dwPlayedTotal = wwo->dwWrittenTotal; wwo->dwPlayedTotal = wwo->dwWrittenTotal;
return INFINITE; return INFINITE;
@ -951,12 +959,13 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEOUT* wwo)
} }
/* Feed wavehdrs until we run out of wavehdrs or DSP space */ /* Feed wavehdrs until we run out of wavehdrs or DSP space */
if (wwo->dwPartialOffset == 0) { if (wwo->dwPartialOffset == 0 && wwo->lpPlayPtr) {
while (wwo->lpPlayPtr && availInQ > 0) { do {
TRACE("Setting time to elapse for %p to %lu\n",
wwo->lpPlayPtr, wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength);
/* note the value that dwPlayedTotal will return when this wave finishes playing */ /* note the value that dwPlayedTotal will return when this wave finishes playing */
wwo->lpPlayPtr->reserved = wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength; wwo->lpPlayPtr->reserved = wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength;
wodPlayer_WriteMaxFrags(wwo, &availInQ); } while (wodPlayer_WriteMaxFrags(wwo, &availInQ) && wwo->lpPlayPtr && availInQ > 0);
}
} }
} }