Merge pull request #2860 from jasp00/mixer-lock

Remove more locks from the mixer
This commit is contained in:
Javier Serrano Polo
2016-06-24 00:19:24 +00:00
committed by GitHub
3 changed files with 25 additions and 62 deletions

View File

@@ -216,8 +216,6 @@ public:
void removePlayHandlesOfTypes( Track * _track, const quint8 types );
bool hasNotePlayHandles();
// methods providing information for other classes
inline fpp_t framesPerPeriod() const
@@ -273,27 +271,6 @@ public:
}
// methods needed by other threads to alter knob values, waveforms, etc
void lockInputFrames()
{
m_inputFramesMutex.lock();
}
void unlockInputFrames()
{
m_inputFramesMutex.unlock();
}
void lockPlayHandleRemoval()
{
m_playHandleRemovalMutex.lock();
}
void unlockPlayHandleRemoval()
{
m_playHandleRemovalMutex.unlock();
}
void getPeakValues( sampleFrame * _ab, const f_cnt_t _frames, float & peakLeft, float & peakRight ) const;
@@ -418,11 +395,6 @@ private:
MidiClient * m_midiClient;
QString m_midiClientName;
// mutexes
QMutex m_inputFramesMutex;
QMutex m_playHandleMutex; // mutex used only for adding playhandles
QMutex m_playHandleRemovalMutex;
// FIFO stuff
fifo * m_fifo;
fifoWriter * m_fifoWriter;