Skip to content

Fix some VST deadlocks/hangs #3776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zonkmachine merged 2 commits into from
Sep 8, 2017
Merged

Fix some VST deadlocks/hangs #3776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e2b17b
Fix some VST deadlocks/hangs
DomClark Aug 24, 2017
7b75de9
Fix segfault on VST plugin I/O change
DomClark Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <QtCore/QTimer>
#include <QtCore/QList>
#include <QMainWindow>
#include <QThread>

#include "ConfigManager.h"
#include "SubWindow.h"
Expand Down Expand Up @@ -248,4 +249,11 @@ private slots:

} ;

class AutoSaveThread : public QThread
{
Q_OBJECT
public:
void run();
} ;

#endif
18 changes: 18 additions & 0 deletions include/RemotePlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ enum RemoteMessageIDs
IdChangeSharedMemoryKey,
IdChangeInputCount,
IdChangeOutputCount,
IdChangeInputOutputCount,
IdShowUI,
IdHideUI,
IdSaveSettingsToString,
Expand Down Expand Up @@ -919,6 +920,15 @@ class RemotePluginClient : public RemotePluginBase
sendMessage( message( IdChangeOutputCount ).addInt( _i ) );
}

void setInputOutputCount( int i, int o )
{
m_inputCount = i;
m_outputCount = o;
sendMessage( message( IdChangeInputOutputCount )
.addInt( i )
.addInt( o ) );
}

virtual int inputCount() const
{
return m_inputCount;
Expand Down Expand Up @@ -1072,6 +1082,14 @@ RemotePluginBase::message RemotePluginBase::waitForMessage(
const message & _wm,
bool _busy_waiting )
{
#ifndef BUILD_REMOTE_PLUGIN_CLIENT
if( _busy_waiting )
{
// No point processing events outside of the main thread
_busy_waiting = QThread::currentThread() ==
QCoreApplication::instance()->thread();
}
#endif
while( !isInvalid() )
{
#ifndef BUILD_REMOTE_PLUGIN_CLIENT
Expand Down
Loading