Merge branch 'stable-1.2'

# Conflicts:
#	include/MixerWorkerThread.h
#	src/core/MixerWorkerThread.cpp
This commit is contained in:
Hyunin Song
2018-05-26 16:02:31 +09:00
15 changed files with 60 additions and 23 deletions

View File

@@ -124,6 +124,8 @@ public:
return m_writablePorts;
}
void invalidateCilent();
MidiPortMenu* m_readablePortsMenu;
MidiPortMenu* m_writablePortsMenu;

View File

@@ -47,10 +47,10 @@ public:
Dynamic // jobs can be added while processing queue
} ;
#define JOB_QUEUE_SIZE 1024
#define JOB_QUEUE_SIZE 8192
JobQueue() :
m_items(),
m_queueSize( 0 ),
m_writeIndex( 0 ),
m_itemsDone( 0 ),
m_opMode( Static )
{
@@ -66,7 +66,7 @@ public:
private:
std::atomic<ThreadableJob*> m_items[JOB_QUEUE_SIZE];
std::atomic_int m_queueSize;
std::atomic_int m_writeIndex;
std::atomic_int m_itemsDone;
OperationMode m_opMode;