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

Qt: Fix proxied events blocking properly

This commit is contained in:
Vicki Pfau 2020-12-04 00:23:07 -08:00
parent 2f7232292c
commit 3aa74f2d65
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ VideoProxy::VideoProxy() {
m_logger.d.postEvent = &callback<void, enum mVideoLoggerEvent>::func<&VideoProxy::postEvent>;
connect(this, &VideoProxy::dataAvailable, this, &VideoProxy::processData);
connect(this, &VideoProxy::eventPosted, this, &VideoProxy::handleEvent);
}
void VideoProxy::attach(CoreController* controller) {
@ -98,19 +97,15 @@ bool VideoProxy::readData(void* data, size_t length, bool block) {
void VideoProxy::postEvent(enum mVideoLoggerEvent event) {
if (QThread::currentThread() == thread()) {
// We're on the main thread
emit eventPosted(event);
handleEvent(event);
} else {
m_mutex.lock();
emit eventPosted(event);
m_fromThreadCond.wait(&m_mutex, 1);
m_mutex.unlock();
QMetaObject::invokeMethod(this, "handleEvent", Qt::BlockingQueuedConnection, Q_ARG(int, event));
}
}
void VideoProxy::handleEvent(int event) {
m_mutex.lock();
m_logger.d.handleEvent(&m_logger.d, static_cast<enum mVideoLoggerEvent>(event));
m_fromThreadCond.wakeAll();
m_mutex.unlock();
}

1
src/platform/qt/VideoProxy.h
View File

@ -28,7 +28,6 @@ public:
signals:
void dataAvailable();
void eventPosted(int);
public slots:
void processData();