Merge pull request #2893 from jasp00/high-cpu

Do not busy wait when writing buffer in mixer

include/Mixer.h

@@ -409,7 +409,6 @@ private:
 	bool m_clearSignal;
 
 	bool m_changesSignal;
-	bool m_waitForMixer;
 	unsigned int m_changes;
 	QMutex m_changesMutex;
 	QMutex m_doChangesMutex;
@@ -417,6 +416,8 @@ private:
 	QWaitCondition m_changesMixerCondition;
 	QWaitCondition m_changesRequestCondition;
 
+	bool m_waitingForWrite;
+
 	friend class LmmsCore;
 	friend class MixerWorkerThread;
 

include/fifo_buffer.h

@@ -57,18 +57,6 @@ public:
 		m_reader_sem.release();
 	}
 
-	bool tryWrite( T _element )
-	{
-		if( m_writer_sem.tryAcquire() )
-		{
-			m_buffer[m_writer_index++] = _element;
-			m_writer_index %= m_size;
-			m_reader_sem.release();
-			return true;
-		}
-		return false;
-	}
-
 	T read()
 	{
 		m_reader_sem.acquire();