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

Qt: Switch VideoProxy to using QMutexLocker

This commit is contained in:
Vicki Pfau 2024-01-30 02:26:00 -08:00
parent 1fc37e9962
commit 4590dfc68b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/platform/qt/VideoProxy.cpp
View File

@ -76,10 +76,9 @@ void VideoProxy::init() {
} }
void VideoProxy::reset() { void VideoProxy::reset() {
m_mutex.lock(); QMutexLocker locker(&m_mutex);
RingFIFOClear(&m_dirtyQueue); RingFIFOClear(&m_dirtyQueue);
m_toThreadCond.wakeAll(); m_toThreadCond.wakeAll();
m_mutex.unlock();
} }
void VideoProxy::deinit() { void VideoProxy::deinit() {
@ -92,10 +91,9 @@ bool VideoProxy::writeData(const void* data, size_t length) {
mVideoLoggerRendererRun(&m_logger, false); mVideoLoggerRendererRun(&m_logger, false);
} else { } else {
emit dataAvailable(); emit dataAvailable();
m_mutex.lock(); QMutexLocker locker(&m_mutex);
m_toThreadCond.wakeAll(); m_toThreadCond.wakeAll();
m_fromThreadCond.wait(&m_mutex); m_fromThreadCond.wait(&m_mutex);
m_mutex.unlock();
} }
} }
return true; return true;
@ -108,10 +106,9 @@ bool VideoProxy::readData(void* data, size_t length, bool block) {
if (!block || read) { if (!block || read) {
break; break;
} }
m_mutex.lock(); QMutexLocker locker(&m_mutex);
m_fromThreadCond.wakeAll(); m_fromThreadCond.wakeAll();
m_toThreadCond.wait(&m_mutex); m_toThreadCond.wait(&m_mutex);
m_mutex.unlock();
} }
return read; return read;
} }
@ -126,9 +123,8 @@ void VideoProxy::postEvent(enum mVideoLoggerEvent event) {
} }
void VideoProxy::handleEvent(int event) { void VideoProxy::handleEvent(int event) {
m_mutex.lock(); QMutexLocker locker(&m_mutex);
m_logger.handleEvent(&m_logger, static_cast<enum mVideoLoggerEvent>(event)); m_logger.handleEvent(&m_logger, static_cast<enum mVideoLoggerEvent>(event));
m_mutex.unlock();
} }
void VideoProxy::lock() { void VideoProxy::lock() {
@ -140,7 +136,7 @@ void VideoProxy::unlock() {
} }
void VideoProxy::wait() { void VideoProxy::wait() {
m_mutex.lock(); QMutexLocker locker(&m_mutex);
while (RingFIFOSize(&m_dirtyQueue)) { while (RingFIFOSize(&m_dirtyQueue)) {
if (QThread::currentThread() == thread()) { if (QThread::currentThread() == thread()) {
// We're on the main thread // We're on the main thread
@ -151,7 +147,6 @@ void VideoProxy::wait() {
m_fromThreadCond.wait(&m_mutex, 1); m_fromThreadCond.wait(&m_mutex, 1);
} }
} }
m_mutex.unlock();
} }
void VideoProxy::wake(int y) { void VideoProxy::wake(int y) {