diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-24 13:20:08 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-24 13:20:08 +0200 |
| commit | 39b7075502b91172e557ec17932dfd68c7da96a1 (patch) | |
| tree | 681194f8c652968c3e525d7c10c25d35e04d499b /src/core/CdStreamPosix.cpp | |
| parent | peds (diff) | |
| parent | more ScriptSounds (diff) | |
| download | re3-39b7075502b91172e557ec17932dfd68c7da96a1.tar re3-39b7075502b91172e557ec17932dfd68c7da96a1.tar.gz re3-39b7075502b91172e557ec17932dfd68c7da96a1.tar.bz2 re3-39b7075502b91172e557ec17932dfd68c7da96a1.tar.lz re3-39b7075502b91172e557ec17932dfd68c7da96a1.tar.xz re3-39b7075502b91172e557ec17932dfd68c7da96a1.tar.zst re3-39b7075502b91172e557ec17932dfd68c7da96a1.zip | |
Diffstat (limited to 'src/core/CdStreamPosix.cpp')
| -rw-r--r-- | src/core/CdStreamPosix.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp index a6ab62bc..fdc63a05 100644 --- a/src/core/CdStreamPosix.cpp +++ b/src/core/CdStreamPosix.cpp @@ -240,9 +240,8 @@ CdStreamRead(int32 channel, void *buffer, uint32 offset, uint32 size) CdReadInfo *pChannel = &gpReadInfo[channel]; ASSERT( pChannel != nil ); - if ( pChannel->nSectorsToRead != 0 || pChannel->bReading ) { - if (pChannel->nSectorOffset == _GET_OFFSET(offset) && pChannel->nSectorsToRead >= size) + if (pChannel->hFile == hImage - 1 && pChannel->nSectorOffset == _GET_OFFSET(offset) && pChannel->nSectorsToRead >= size) return STREAM_SUCCESS; flushStream[channel] = 1; @@ -293,7 +292,6 @@ CdStreamGetStatus(int32 channel) if ( pChannel->nStatus != STREAM_NONE ) { int32 status = pChannel->nStatus; - pChannel->nStatus = STREAM_NONE; return status; @@ -322,15 +320,16 @@ CdStreamSync(int32 channel) pthread_kill(pChannel->pChannelThread, SIGUSR1); if (pChannel->bReading) { pChannel->bLocked = true; - sem_wait(pChannel->pDoneSemaphore); + while (pChannel->bLocked) + sem_wait(pChannel->pDoneSemaphore); } #else pChannel->nSectorsToRead = 0; if (pChannel->bReading) { pChannel->bLocked = true; pthread_kill(_gCdStreamThread, SIGUSR1); - sem_wait(pChannel->pDoneSemaphore); - + while (pChannel->bLocked) + sem_wait(pChannel->pDoneSemaphore); } #endif pChannel->bReading = false; @@ -341,8 +340,8 @@ CdStreamSync(int32 channel) if ( pChannel->nSectorsToRead != 0 ) { pChannel->bLocked = true; - - sem_wait(pChannel->pDoneSemaphore); + while (pChannel->bLocked) + sem_wait(pChannel->pDoneSemaphore); } pChannel->bReading = false; @@ -443,9 +442,9 @@ void *CdStreamThread(void *param) #endif pChannel->nSectorsToRead = 0; - if ( pChannel->bLocked ) { + pChannel->bLocked = 0; sem_post(pChannel->pDoneSemaphore); } pChannel->bReading = false; |