Commit aef21c19 authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

winecoreaudio: Eliminate unnecessary variable, unreachable code, unused retval.

parent 7cecf7a4
...@@ -179,7 +179,7 @@ static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; ...@@ -179,7 +179,7 @@ static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV];
static CFMessagePortRef Port_SendToMessageThread; static CFMessagePortRef Port_SendToMessageThread;
static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo);
static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force);
extern int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au); extern int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au);
...@@ -888,22 +888,14 @@ static void wodHelper_CheckForLoopBegin(WINE_WAVEOUT* wwo) ...@@ -888,22 +888,14 @@ static void wodHelper_CheckForLoopBegin(WINE_WAVEOUT* wwo)
* Advance the play pointer to the next waveheader, looping if required. * Advance the play pointer to the next waveheader, looping if required.
* Call from AudioUnit IO thread can't use Wine debug channels. * Call from AudioUnit IO thread can't use Wine debug channels.
*/ */
static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo)
{ {
LPWAVEHDR lpWaveHdr;
BOOL didLoopBack = FALSE; BOOL didLoopBack = FALSE;
pthread_mutex_lock(&wwo->lock); pthread_mutex_lock(&wwo->lock);
lpWaveHdr = wwo->lpPlayPtr;
if (!lpWaveHdr)
{
pthread_mutex_unlock(&wwo->lock);
return NULL;
}
wwo->dwPartialOffset = 0; wwo->dwPartialOffset = 0;
if ((lpWaveHdr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr) if ((wwo->lpPlayPtr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr)
{ {
/* We're at the end of a loop, loop if required */ /* We're at the end of a loop, loop if required */
if (wwo->dwLoops > 1) if (wwo->dwLoops > 1)
...@@ -920,11 +912,9 @@ static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) ...@@ -920,11 +912,9 @@ static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo)
if (!didLoopBack) if (!didLoopBack)
{ {
/* We didn't loop back. Advance to the next wave header */ /* We didn't loop back. Advance to the next wave header */
lpWaveHdr = lpWaveHdr->lpNext; wwo->lpPlayPtr = wwo->lpPlayPtr->lpNext;
wwo->lpPlayPtr = lpWaveHdr;
if (!lpWaveHdr) if (!wwo->lpPlayPtr)
{ {
OSStatus status; OSStatus status;
wwo->state = WINE_WS_STOPPED; wwo->state = WINE_WS_STOPPED;
...@@ -938,7 +928,6 @@ static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) ...@@ -938,7 +928,6 @@ static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo)
} }
pthread_mutex_unlock(&wwo->lock); pthread_mutex_unlock(&wwo->lock);
return lpWaveHdr;
} }
/* if force is TRUE then notify the client that all the headers were completed /* if force is TRUE then notify the client that all the headers were completed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment