Remove the FIFO thread

include/AudioAlsa.h

@@ -100,6 +100,7 @@ class AudioAlsa : public QThread, public AudioDevice
 	snd_pcm_sw_params_t * m_swParams;
 
 	bool m_convertEndian;
+	std::atomic<bool> m_stopped;
 
 } ;
 

include/AudioDevice.h

@@ -81,23 +81,10 @@ class AudioDevice
 		return m_channels;
 	}
 
-	void processNextBuffer();
-
-	virtual void startProcessing()
-	{
-		m_inProcess = true;
-	}
-
+	virtual void startProcessing();
 	virtual void stopProcessing();
 
 protected:
-	// subclasses can re-implement this for being used in conjunction with
-	// processNextBuffer()
-	virtual void writeBuffer(const SampleFrame* /* _buf*/, const fpp_t /*_frames*/) {}
-
-	// called by according driver for fetching new sound-data
-	fpp_t getNextBuffer(SampleFrame* _ab);
-
 	// convert a given audio-buffer to a buffer in signed 16-bit samples
 	// returns num of bytes in outbuf
 	int convertToS16(const SampleFrame* _ab,
@@ -130,12 +117,7 @@ class AudioDevice
 	sample_rate_t m_sampleRate;
 	ch_cnt_t m_channels;
 	AudioEngine* m_audioEngine;
-	bool m_inProcess;
-
 	QMutex m_devMutex;
-
-	SampleFrame* m_buffer;
-
 };
 
 } // namespace lmms

include/AudioDummy.h

@@ -80,30 +80,23 @@ class AudioDummy : public QThread, public AudioDevice
 private:
 	void startProcessing() override
 	{
+		m_stopped = false;
 		start();
 	}
 
 	void stopProcessing() override
 	{
+		m_stopped = true;
 		stopProcessingThread( this );
 	}
 
 	void run() override
 	{
 		MicroTimer timer;
-		while( true )
+		while (!m_stopped)
 		{
+			audioEngine()->renderNextBuffer();
 			timer.reset();
-			const SampleFrame* b = audioEngine()->nextBuffer();
-			if( !b )
-			{
-				break;
-			}
-			if( audioEngine()->hasFifoWriter() )
-			{
-				delete[] b;
-			}
-
 			const int microseconds = static_cast<int>( audioEngine()->framesPerPeriod() * 1000000.0f / audioEngine()->outputSampleRate() - timer.elapsed() );
 			if( microseconds > 0 )
 			{
@@ -112,6 +105,7 @@ class AudioDummy : public QThread, public AudioDevice
 		}
 	}
 
+	std::atomic<bool> m_stopped;
 } ;
 
 } // namespace lmms

include/AudioEngine.h

@@ -37,7 +37,6 @@
 #include "lmms_basics.h"
 #include "SampleFrame.h"
 #include "LocklessList.h"
-#include "FifoBuffer.h"
 #include "AudioEngineProfiler.h"
 #include "PlayHandle.h"
 
@@ -160,10 +159,7 @@ class LMMS_EXPORT AudioEngine : public QObject
 
 	//! Set new audio device. Old device will be deleted,
 	//! unless it's stored using storeAudioDevice
-	void setAudioDevice( AudioDevice * _dev,
-				const struct qualitySettings & _qs,
-				bool _needs_fifo,
-				bool startNow );
+	void setAudioDevice(AudioDevice* _dev, const struct qualitySettings& _qs, bool startNow);
 	void storeAudioDevice();
 	void restoreAudioDevice();
 	inline AudioDevice * audioDev()
@@ -214,6 +210,7 @@ class LMMS_EXPORT AudioEngine : public QObject
 		return m_framesPerPeriod;
 	}
 
+	fpp_t userFramesPerPeriod() const { return m_userFramesPerPeriod; }
 
 	AudioEngineProfiler& profiler()
 	{
@@ -278,11 +275,6 @@ class LMMS_EXPORT AudioEngine : public QObject
 
 	bool criticalXRuns() const;
 
-	inline bool hasFifoWriter() const
-	{
-		return m_fifoWriter != nullptr;
-	}
-
 	void pushInputFrames( SampleFrame* _ab, const f_cnt_t _frames );
 
 	inline const SampleFrame* inputBuffer()
@@ -295,10 +287,8 @@ class LMMS_EXPORT AudioEngine : public QObject
 		return m_inputBufferFrames[ m_inputBufferRead ];
 	}
 
-	inline const SampleFrame* nextBuffer()
-	{
-		return hasFifoWriter() ? m_fifo->read() : renderNextBuffer();
-	}
+	const SampleFrame* renderNextBuffer();
+	void renderNextBufferChunked(SampleFrame* dst, std::size_t size);
 
 	void changeQuality(const struct qualitySettings & qs);
 
@@ -322,31 +312,10 @@ class LMMS_EXPORT AudioEngine : public QObject
 
 
 private:
-	using Fifo = FifoBuffer<SampleFrame*>;
-
-	class fifoWriter : public QThread
-	{
-	public:
-		fifoWriter( AudioEngine * audioEngine, Fifo * fifo );
-
-		void finish();
-
-
-	private:
-		AudioEngine * m_audioEngine;
-		Fifo * m_fifo;
-		volatile bool m_writing;
-
-		void run() override;
-
-		void write(SampleFrame* buffer);
-	} ;
-
-
 	AudioEngine( bool renderOnly );
 	~AudioEngine() override;
 
-	void startProcessing(bool needsFifo = true);
+	void startProcessing();
 	void stopProcessing();
 
 
@@ -358,8 +327,6 @@ class LMMS_EXPORT AudioEngine : public QObject
 	void renderStageEffects();
 	void renderStageMix();
 
-	const SampleFrame* renderNextBuffer();
-
 	void swapBuffers();
 
 	void clearInternal();
@@ -369,6 +336,7 @@ class LMMS_EXPORT AudioEngine : public QObject
 	std::vector<AudioPort *> m_audioPorts;
 
 	fpp_t m_framesPerPeriod;
+	fpp_t m_userFramesPerPeriod;
 
 	SampleFrame* m_inputBuffer[2];
 	f_cnt_t m_inputBufferFrames[2];
@@ -405,10 +373,6 @@ class LMMS_EXPORT AudioEngine : public QObject
 	MidiClient * m_midiClient;
 	QString m_midiClientName;
 
-	// FIFO stuff
-	Fifo * m_fifo;
-	fifoWriter * m_fifoWriter;
-
 	AudioEngineProfiler m_profiler;
 
 	bool m_clearSignal;

include/AudioFileDevice.h

@@ -49,6 +49,7 @@ class AudioFileDevice : public AudioDevice
 
 	OutputSettings const & getOutputSettings() const { return m_outputSettings; }
 
+	virtual void writeBuffer(const SampleFrame* buf, const fpp_t frames) = 0;
 
 protected:
 	int writeData( const void* data, int len );

include/AudioJack.h

@@ -110,11 +110,6 @@ private slots:
 
 	std::atomic<MidiJack*> m_midiClient;
 	std::vector<jack_port_t*> m_outputPorts;
-	jack_default_audio_sample_t** m_tempOutBufs;
-	SampleFrame* m_outBuf;
-
-	f_cnt_t m_framesDoneInCurBuf;
-	f_cnt_t m_framesToDoInCurBuf;
 
 #ifdef AUDIO_PORT_SUPPORT
 	struct StereoPort

include/AudioOss.h

@@ -84,6 +84,7 @@ class setupWidget : public gui::AudioDeviceSetupWidget
 	int m_audioFD;
 
 	bool m_convertEndian;
+	std::atomic<bool> m_stopped;
 
 } ;
 

include/AudioPortAudio.h

@@ -145,11 +145,6 @@ class AudioPortAudio : public AudioDevice
 	PaStreamParameters m_inputParameters;
 
 	bool m_wasPAInitError;
-
-	SampleFrame* m_outBuf;
-	std::size_t m_outBufPos;
-	fpp_t m_outBufSize;
-
 	bool m_stopped;
 
 } ;

include/AudioPulseAudio.h

@@ -90,11 +90,12 @@ class AudioPulseAudio : public QThread, public AudioDevice
 	void stopProcessing() override;
 	void run() override;
 
-	volatile bool m_quit;
-
 	bool m_convertEndian;
 
 	bool m_connected;
+
+	std::atomic<bool> m_stopped;
+
 	QSemaphore m_connectedSemaphore;
 
 } ;

include/AudioSampleRecorder.h

@@ -48,7 +48,7 @@ class AudioSampleRecorder : public AudioDevice
 	std::shared_ptr<const SampleBuffer> createSampleBuffer();
 
 private:
-	void writeBuffer(const SampleFrame* _ab, const fpp_t _frames) override;
+	void writeBuffer(const SampleFrame* _ab, const fpp_t _frames);
 
 	using BufferList = QList<QPair<SampleFrame*, fpp_t>>;
 	BufferList m_buffers;

include/AudioSdl.h

@@ -84,8 +84,6 @@ class AudioSdl : public AudioDevice
 
 	SDL_AudioSpec m_audioHandle;
 
-	SampleFrame* m_outBuf;
-
 	size_t m_currentBufferFramePos;
 	size_t m_currentBufferFramesCount;
 

include/AudioSndio.h

@@ -81,6 +81,7 @@ class AudioSndio : public QThread, public AudioDevice
 	struct sio_par m_par;
 
 	bool m_convertEndian;
+	std::atomic<bool> m_stopped;
 } ;
 
 

include/AudioSoundIo.h

@@ -110,11 +110,6 @@ class AudioSoundIo : public AudioDevice
 	SoundIo *m_soundio;
 	SoundIoOutStream *m_outstream;
 
-	SampleFrame* m_outBuf;
-	int m_outBufSize;
-	fpp_t m_outBufFramesTotal;
-	fpp_t m_outBufFrameIndex;
-
 	bool m_stopped;
 	bool m_outstreamStarted;