ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qt

This commit is contained in:
Jeffrey Pfau 2014-10-18 02:24:05 -07:00
parent 4b7883e1fd 4d9c375f0e
commit f1de3d603a
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gba/gba-thread.c
View File

@ -76,14 +76,14 @@ static void _pauseThread(struct GBAThread* threadContext, bool onThread) {
} }
} }
static void _changeVideoSync(struct GBAThread* threadContext, bool frameOn) { static void _changeVideoSync(struct GBASync* sync, bool frameOn) {
// Make sure the video thread can process events while the GBA thread is paused // Make sure the video thread can process events while the GBA thread is paused
MutexLock(&threadContext->sync.videoFrameMutex); MutexLock(&sync->videoFrameMutex);
if (frameOn != threadContext->sync.videoFrameOn) { if (frameOn != sync->videoFrameOn) {
threadContext->sync.videoFrameOn = frameOn; sync->videoFrameOn = frameOn;
ConditionWake(&threadContext->sync.videoFrameAvailableCond); ConditionWake(&sync->videoFrameAvailableCond);
} }
MutexUnlock(&threadContext->sync.videoFrameMutex); MutexUnlock(&sync->videoFrameMutex);
} }
static THREAD_ENTRY _GBAThreadRun(void* context) { static THREAD_ENTRY _GBAThreadRun(void* context) {
@ -434,7 +434,7 @@ void GBAThreadPause(struct GBAThread* threadContext) {
} }
MutexUnlock(&threadContext->stateMutex); MutexUnlock(&threadContext->stateMutex);
_changeVideoSync(threadContext, frameOn); _changeVideoSync(&threadContext->sync, frameOn);
} }
void GBAThreadUnpause(struct GBAThread* threadContext) { void GBAThreadUnpause(struct GBAThread* threadContext) {
@ -446,7 +446,7 @@ void GBAThreadUnpause(struct GBAThread* threadContext) {
} }
MutexUnlock(&threadContext->stateMutex); MutexUnlock(&threadContext->stateMutex);
_changeVideoSync(threadContext, true); _changeVideoSync(&threadContext->sync, true);
} }
bool GBAThreadIsPaused(struct GBAThread* threadContext) { bool GBAThreadIsPaused(struct GBAThread* threadContext) {
@ -471,7 +471,7 @@ void GBAThreadTogglePause(struct GBAThread* threadContext) {
} }
MutexUnlock(&threadContext->stateMutex); MutexUnlock(&threadContext->stateMutex);
_changeVideoSync(threadContext, frameOn); _changeVideoSync(&threadContext->sync, frameOn);
} }
void GBAThreadPauseFromThread(struct GBAThread* threadContext) { void GBAThreadPauseFromThread(struct GBAThread* threadContext) {
@ -484,7 +484,7 @@ void GBAThreadPauseFromThread(struct GBAThread* threadContext) {
} }
MutexUnlock(&threadContext->stateMutex); MutexUnlock(&threadContext->stateMutex);
_changeVideoSync(threadContext, frameOn); _changeVideoSync(&threadContext->sync, frameOn);
} }
#ifdef USE_PTHREADS #ifdef USE_PTHREADS
@ -561,7 +561,9 @@ bool GBASyncWaitFrameStart(struct GBASync* sync, int frameskip) {
if (!sync->videoFrameOn && !sync->videoFramePending) { if (!sync->videoFrameOn && !sync->videoFramePending) {
return false; return false;
} }
if (sync->videoFrameOn) {
ConditionWait(&sync->videoFrameAvailableCond, &sync->videoFrameMutex); ConditionWait(&sync->videoFrameAvailableCond, &sync->videoFrameMutex);
}
sync->videoFramePending = 0; sync->videoFramePending = 0;
sync->videoFrameSkip = frameskip; sync->videoFrameSkip = frameskip;
return true; return true;
@ -579,6 +581,14 @@ bool GBASyncDrawingFrame(struct GBASync* sync) {
return sync->videoFrameSkip <= 0; return sync->videoFrameSkip <= 0;
} }
void GBASyncSuspendDrawing(struct GBASync* sync) {
_changeVideoSync(sync, false);
}
void GBASyncResumeDrawing(struct GBASync* sync) {
_changeVideoSync(sync, true);
}
void GBASyncProduceAudio(struct GBASync* sync, bool wait) { void GBASyncProduceAudio(struct GBASync* sync, bool wait) {
if (sync->audioWait && wait) { if (sync->audioWait && wait) {
// TODO loop properly in event of spurious wakeups // TODO loop properly in event of spurious wakeups

3
src/gba/gba-thread.h
View File

@ -121,6 +121,9 @@ bool GBASyncWaitFrameStart(struct GBASync* sync, int frameskip);
void GBASyncWaitFrameEnd(struct GBASync* sync); void GBASyncWaitFrameEnd(struct GBASync* sync);
bool GBASyncDrawingFrame(struct GBASync* sync); bool GBASyncDrawingFrame(struct GBASync* sync);
void GBASyncSuspendDrawing(struct GBASync* sync);
void GBASyncResumeDrawing(struct GBASync* sync);
void GBASyncProduceAudio(struct GBASync* sync, bool wait); void GBASyncProduceAudio(struct GBASync* sync, bool wait);
void GBASyncLockAudio(struct GBASync* sync); void GBASyncLockAudio(struct GBASync* sync);
void GBASyncUnlockAudio(struct GBASync* sync); void GBASyncUnlockAudio(struct GBASync* sync);