Remove audio engine from exporting code

include/AudioDevice.h

@@ -90,26 +90,26 @@ class AudioDevice
 
 	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,
+	static int convertToS16(const SampleFrame* _ab,
 						const fpp_t _frames,
 						int_sample_t * _output_buffer,
 						const bool _convert_endian = false );
 
 	// clear given signed-int-16-buffer
-	void clearS16Buffer( int_sample_t * _outbuf,
-							const fpp_t _frames );
+	static void clearS16Buffer(int_sample_t * _outbuf,
+							const fpp_t _frames);
+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);
 
-	inline void setSampleRate( const sample_rate_t _new_sr )
+	inline void setSampleRate(const sample_rate_t _new_sr)
 	{
 		m_sampleRate = _new_sr;
 	}

include/AudioEngine.h

@@ -339,6 +339,8 @@ class LMMS_EXPORT AudioEngine : public QObject
 	void startProcessing(bool needsFifo = true);
 	void stopProcessing();
 
+	void startExporting(const struct qualitySettings& qs);
+
 
 	AudioDevice * tryAudioDevices();
 	MidiClient * tryMidiClients();

include/AudioFileDevice.h

@@ -28,19 +28,23 @@
 
 #include <QFile>
 
-#include "AudioDevice.h"
 #include "OutputSettings.h"
 
 namespace lmms
 {
 
-class AudioFileDevice : public AudioDevice
+class SampleFrame;
+
+class AudioFileDevice
 {
 public:
+	// getBufferFunction
+	using BufferFn = std::function<void(SampleFrame*, fpp_t*, fpp_t)>;
+
 	AudioFileDevice(OutputSettings const & outputSettings,
-			const ch_cnt_t _channels, const QString & _file,
-			AudioEngine* audioEngine );
-	~AudioFileDevice() override;
+			const QString & _file,
+			const fpp_t defaultBufferSize);
+	virtual ~AudioFileDevice();
 
 	QString outputFile() const
 	{
@@ -49,8 +53,20 @@ class AudioFileDevice : public AudioDevice
 
 	OutputSettings const & getOutputSettings() const { return m_outputSettings; }
 
+	sample_rate_t getSampleRate();
+	// how many samples to store in a buffer
+	const fpp_t getDefaultFrameCount();
+
+	void setSampleRate(sample_rate_t newSampleRate);
+
+	// save audio
+	void processThisBuffer(SampleFrame* frameBuffer, const fpp_t frameCount);
+
 
 protected:
+	// subclasses can re-implement this for being used in conjunction with
+	virtual void writeBuffer(const SampleFrame* /* _buf*/, const fpp_t /*_frames*/) {}
+
 	int writeData( const void* data, int len );
 
 	inline bool outputFileOpened() const
@@ -66,10 +82,12 @@ class AudioFileDevice : public AudioDevice
 private:
 	QFile m_outputFile;
 	OutputSettings m_outputSettings;
+
+	const fpp_t m_defaultFrameCount;
 } ;
 
 using AudioFileDeviceInstantiaton
-	= AudioFileDevice* (*)(const QString&, const OutputSettings&, const ch_cnt_t, AudioEngine*, bool&);
+	= AudioFileDevice* (*)(const OutputSettings&, bool&, const QString&, const fpp_t);
 
 } // namespace lmms
 

include/AudioFileFlac.h

@@ -37,26 +37,22 @@ class AudioFileFlac : public AudioFileDevice
 {
 public:
 	AudioFileFlac(OutputSettings const& outputSettings,
-			ch_cnt_t const channels,
 			bool& successful,
-			QString const& file,
-			AudioEngine* audioEngine
-	);
-
+			const QString& file,
+			const fpp_t defaultBufferSize);
 	~AudioFileFlac() override;
 
-	static AudioFileDevice* getInst(QString const& outputFilename,
-			OutputSettings const& outputSettings,
-			ch_cnt_t const channels,
-			AudioEngine* audioEngine,
-			bool& successful)
+	static AudioFileDevice* getInst(
+			OutputSettings const &outputSettings,
+			bool &successful,
+			const QString & outputFilename,
+			const fpp_t defaultBufferSize)
 	{
 		return new AudioFileFlac(
 			outputSettings,
-			channels,
 			successful,
 			outputFilename,
-			audioEngine
+			defaultBufferSize
 		);
 	}
 

include/AudioFileMP3.h

@@ -40,21 +40,24 @@ namespace lmms
 class AudioFileMP3 : public AudioFileDevice
 {
 public:
-	AudioFileMP3( OutputSettings const & outputSettings,
-			const ch_cnt_t _channels,
-			bool & successful,
-			const QString & _file,
-			AudioEngine* audioEngine );
+	AudioFileMP3(OutputSettings const& outputSettings,
+			bool& successful,
+			const QString& file,
+			const fpp_t defaultBufferSize);
 	~AudioFileMP3() override;
 
-	static AudioFileDevice * getInst( const QString & outputFilename,
-					  OutputSettings const & outputSettings,
-					  const ch_cnt_t channels,
-					  AudioEngine* audioEngine,
-					  bool & successful )
+	static AudioFileDevice* getInst(
+			OutputSettings const &outputSettings,
+			bool &successful,
+			const QString & outputFilename,
+			const fpp_t defaultBufferSize)
 	{
-		return new AudioFileMP3( outputSettings, channels, successful,
-					 outputFilename, audioEngine );
+		return new AudioFileMP3(
+			outputSettings,
+			successful,
+			outputFilename,
+			defaultBufferSize
+		);
 	}
 
 protected:

include/AudioFileOgg.h

@@ -40,20 +40,24 @@ namespace lmms
 class AudioFileOgg : public AudioFileDevice
 {
 public:
-	AudioFileOgg( OutputSettings const & outputSettings,
-			const ch_cnt_t _channels,
-			bool & _success_ful,
-			const QString & _file,
-			AudioEngine* audioEngine );
+	AudioFileOgg(OutputSettings const& outputSettings,
+			bool& successful,
+			const QString& file,
+			const fpp_t defaultBufferSize);
 	~AudioFileOgg() override;
 
-	static AudioFileDevice * getInst( const QString & outputFilename,
-					  OutputSettings const & outputSettings,
-					  const ch_cnt_t channels,
-					  AudioEngine* audioEngine,
-					  bool & successful )
+	static AudioFileDevice* getInst(
+			OutputSettings const &outputSettings,
+			bool &successful,
+			const QString & outputFilename,
+			const fpp_t defaultBufferSize)
 	{
-		return new AudioFileOgg( outputSettings, channels, successful, outputFilename, audioEngine );
+		return new AudioFileOgg(
+			outputSettings,
+			successful,
+			outputFilename,
+			defaultBufferSize
+		);
 	}
 
 

include/AudioFileWave.h

@@ -37,21 +37,24 @@ namespace lmms
 class AudioFileWave : public AudioFileDevice
 {
 public:
-	AudioFileWave( OutputSettings const & outputSettings,
-			const ch_cnt_t channels,
-			bool & successful,
-			const QString & file,
-			AudioEngine* audioEngine );
+	AudioFileWave(OutputSettings const& outputSettings,
+			bool& successful,
+			const QString& file,
+			const fpp_t defaultBufferSize);
 	~AudioFileWave() override;
 
-	static AudioFileDevice * getInst( const QString & outputFilename,
-					  OutputSettings const & outputSettings,
-					  const ch_cnt_t channels,
-					  AudioEngine* audioEngine,
-					  bool & successful )
+	static AudioFileDevice* getInst(
+			OutputSettings const &outputSettings,
+			bool &successful,
+			const QString & outputFilename,
+			const fpp_t defaultBufferSize)
 	{
-		return new AudioFileWave( outputSettings, channels, successful,
-					  outputFilename, audioEngine );
+		return new AudioFileWave(
+			outputSettings,
+			successful,
+			outputFilename,
+			defaultBufferSize
+		);
 	}
 
 

include/ExportProjectDialog.h

@@ -62,7 +62,7 @@ private slots:
 	QString m_fileExtension;
 	bool m_multiExport;
 
-	ProjectRenderer::ExportFileFormat m_ft;
+	LmmsExporter::ExportAudioFileFormat m_ft;
 	std::unique_ptr<RenderManager> m_renderManager;
 } ;
 

include/LmmsExporter.h

@@ -0,0 +1,130 @@
+/*
+ * LmmsExporter.h - exporting files (currently only audio files), TODO rename class when things change
+ *
+ * Copyright (c) 2024 szeli1 <TODO/at/gmail/dot.com>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_LMMS_EXPORTER_H
+#define LMMS_LMMS_EXPORTER_H
+
+#include <functional>
+#include <thread>
+#include <vector>
+
+#include "AudioFileDevice.h"
+#include "SampleFrame.h"
+
+namespace lmms
+{
+class LmmsExporter
+{
+public:
+	using BufferFn = std::function<void(std::vector<SampleFrame>*, void*)>;
+	using EndFn = std::function<void(void*)>;
+
+	enum class ExportAudioFileFormat : int
+	{
+		Wave,
+		Flac,
+		Ogg,
+		MP3,
+		Count
+	};
+	// in the future more types can be added
+	enum class ExportFileType
+	{
+		Audio
+	};
+
+	constexpr static auto NumFileFormats = static_cast<std::size_t>(ExportAudioFileFormat::Count);
+
+	struct FileEncodeDevice
+	{
+		bool isAvailable() const { return m_getDevInst != nullptr; }
+
+		ExportAudioFileFormat m_fileFormat;
+		const char* m_description;
+		const char* m_extension;
+		AudioFileDeviceInstantiaton m_getDevInst;
+	};
+
+	LmmsExporter(const ExportFileType fileType,
+				const QString& outputLocationAndName);
+	~LmmsExporter();
+
+	void setupAudioRendering(
+			const OutputSettings& outputSettings,
+			ExportAudioFileFormat fileFormat,
+			const fpp_t defaultFrameCount,
+			SampleFrame* exportBuffer,
+			const fpp_t exportBufferFrameCount);
+	void setupAudioRendering(
+			const OutputSettings& outputSettings,
+			ExportAudioFileFormat fileFormat,
+			const fpp_t defaultFrameCount,
+			BufferFn getBufferFunction,
+			EndFn endFunction,
+			void* getBufferData);
+	bool canExportAutioFile() const;
+
+	static ExportAudioFileFormat getAudioFileFormatFromFileName(const QString& fileName);
+	static ExportAudioFileFormat getAudioFileFormatFromExtension(const QString& extenisonString);
+	static QString getAudioFileExtensionFromFormat(ExportAudioFileFormat fmt);
+
+	static const std::array<FileEncodeDevice, 5> s_fileEncodeDevices;
+
+	void startExporting();
+	void stopExporting();
+
+private:
+	static void processExportingAudioFile(LmmsExporter* thisExporter);
+
+	// audio exporting
+	bool processNextBuffer();
+	bool processThisBuffer(SampleFrame* frameBuffer, const fpp_t frameCount);
+	void setupAudioRenderingInternal(
+		const OutputSettings& outputSettings,
+		ExportAudioFileFormat fileFormat,
+		const fpp_t defaultFrameCount);
+
+
+
+	ExportFileType m_exportFileType;
+	QString m_outputFile;
+
+	volatile bool m_abort;
+
+	// called if not nullptr
+	// while run()
+	// if returned buffer.size() <= 0 then break; end
+	BufferFn m_getBufferFunction;
+	// called at the end of run(), can be nullptr
+	EndFn m_endFunction;
+	void* m_getBufferData;
+
+	AudioFileDevice* m_fileDev;
+	std::vector<SampleFrame> m_buffer;
+	std::unique_ptr<std::thread> m_thread;
+};
+
+} // namespace lmms
+
+#endif // LMMS_LMMS_EXPORTER_H