Remove audio engine from exporting code #7452

szeli1 · 2024-08-14T20:50:55Z

potentially closes #7449

Project folder needs to export to its own audio and AudioEngine does not allow this.

This pull request removes AudioEngine and AudioDevice from AudioFileDevice so the exporting code does not depend on it. This way in the future a Project folder can provide its own audio buffers simplifying the exporting process.
A new class is added to handle only exporting code. It is called "LmmsExporter" because in the future it might need to support exporting other datatypes.

AudioEngine::doSetAudioDevice is now unused.

Needs testing.

TODO:

remove qDebug
remove TODO
check includes

Rossmaxx

This is what I got for now.

Rossmaxx · 2024-08-23T13:19:17Z

include/AudioDevice.h

 						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,


Suggested change

static void clearS16Buffer(int_sample_t * _outbuf,

static void clearS16Buffer(int_sample_t* _outbuf,

Rossmaxx · 2024-08-23T13:20:59Z

include/AudioFileOgg.h

+	static AudioFileDevice* getInst(
+			OutputSettings const &outputSettings,
+			bool &successful,
+			const QString & outputFilename,


Suggested change

const QString & outputFilename,

const QString& outputFilename,

Rossmaxx · 2024-08-23T13:21:28Z

include/AudioFileWave.h

+	static AudioFileDevice* getInst(
+			OutputSettings const &outputSettings,
+			bool &successful,
+			const QString & outputFilename,


Suggested change

const QString & outputFilename,

const QString& outputFilename,

Rossmaxx · 2024-08-23T13:24:41Z

src/core/AudioEngine.cpp

@@ -240,6 +240,15 @@ void AudioEngine::stopProcessing()
 }


+void AudioEngine::startExporting(const struct qualitySettings& qs)


Shouldn't there be a finishExporting too?

Else there's chances of lmms becoming unresponsive after export.

Finish exporting would run AudioEngine::stopProcessing(). I could add in that function if you want.

If on finish, processing is stopped, then why do you need to stop processing on starting export too?

Rossmaxx · 2024-08-23T13:27:53Z

src/core/ProjectRenderer.cpp

@@ -242,5 +97,50 @@ void ProjectRenderer::updateConsoleProgress()
 	fflush( stderr );
 }

+// gets a buffer and some data as input


I think saker said on discord about this. The comment should go in the header file as

/* * First line * Second line * ... */

format

Shouldn't it look like this?:

/** * First line * Second line * ... */

And does this mean that I need to rewrite every comment I wrote in my PRs?

Yeah this is what i meant, and regarding re writing, don't rewrite everything, just the ones you use to describe the function.

Rossmaxx · 2024-08-23T13:28:20Z

src/core/ProjectRenderer.cpp

+	if (newBuffer != nullptr && Engine::getSong()->isExportDone() == false)
+	{
+		// copy new buffer to bufferOut
+		for (size_t i = 0; i < bufferOut->size(); i++)


I believe there's a std::copy for this.

Rossmaxx · 2024-08-23T13:29:20Z

src/core/audio/AudioDevice.cpp

 {
+	const unsigned int channels = 2;


If this doesn't change at all, better make it constexpr

Rossmaxx · 2024-08-23T13:30:03Z

src/core/audio/AudioDevice.cpp

 			{
 				auto temp = static_cast<int_sample_t>(AudioEngine::clip(_ab[frame][chnl]) * OUTPUT_SAMPLE_MULTIPLIER);

-				( _output_buffer + frame * channels() )[chnl] =
+				( _output_buffer + frame * channels )[chnl] =


Suggested change

( _output_buffer + frame * channels )[chnl] =

(_output_buffer + frame * channels)[chnl] =

Btw what's this used for?

I don't know.

But audio exporting classes use it.

Rossmaxx · 2024-08-23T13:30:47Z

src/core/audio/AudioDevice.cpp

 }




-void AudioDevice::clearS16Buffer( int_sample_t * _outbuf, const fpp_t _frames )
+void AudioDevice::clearS16Buffer(int_sample_t * _outbuf, const fpp_t _frames)


Suggested change

void AudioDevice::clearS16Buffer(int_sample_t * _outbuf, const fpp_t _frames)

void AudioDevice::clearS16Buffer(int_sample_t* _outbuf, const fpp_t _frames)

Rossmaxx · 2024-08-23T13:32:19Z

src/core/audio/AudioFileWave.cpp

 	OutputSettings::BitDepth bitDepth = getOutputSettings().getBitDepth();

 	if( bitDepth == OutputSettings::BitDepth::Depth32Bit || bitDepth == OutputSettings::BitDepth::Depth24Bit )
 	{
-		auto buf = new float[_frames * channels()];
+		auto buf = new float[_frames * channels];


Std::array?

szeli1 added 29 commits August 14, 2024 12:37

AudioEngine_adding_new_export_classes

2ac8a9c

AudioFileDevice_removing_AudioEngine_and_AudioDevice

d4d19d7

AudioFileFlac_updating_constructors_part_1

9bb6b5e

AudioFileMP3_updating_constructors_part_1

377e3f4

AudioFileOgg_updating_constructors_part_1

738e0ba

AudioFileWave_updating_constructors_part_1

092e9cd

AudioDevice_audiobuffering_made_static

22f162e

ProjectRenderer_updating_m_FileDev_constructor

1d6d47f

AudioEngine_moving_processing_function

ccab40a

AudioFileDevice_removing_processNextBuffer_function

a5b44f1

AudioFileFlac_updating_constructor_part_2

d5c6efd

AudioFileMP3_updating_constructor_part_2

7733c47

AudioFileOgg_updating_constructor_part_2

934571d

AudioFileWave_updating_constructor_part_2

f5436f8

ProjectRenderer_removing_Project_code

80f9dd6

RenderManager_adding_project_code

d78d614

RenderManager_fixing_endRendering_function

3ad71bb

AudioAlsa_updating_convertToS16

4e56afa

AudioOss_updating_convertToS16

85e7a1e

AudioPulseAudio_updating_convertToS16

2813474

AudioSndio_updating_convertToS16

f7a8173

ExportProjcetDialog_replacing_ProjectRenderer

8788800

ProjectRenderer_renaming_to_ActiveRenderer

b7fd2d6

ActiveRenderer_renaming_ProjectRenderer

b6cc6f5

RenderManager_renaming_ProjectRenderer

3dfbfa1

AudioEngine_renaming_ProjectRenderer

7f9ab91

CMakeLists_renaming_ProjectRenderer

183b2fb

main_renaming_ProjecRenderer

5c80787

MainWindow_renaming_ProjectRenderer

e3d7fe1

szeli1 marked this pull request as draft August 14, 2024 20:51

szeli1 added 27 commits August 22, 2024 12:04

ProjectRenderer_reset_file

0207f38

RenderManager_reset_file

cc1094a

RenderManager_implement_LmmsExporter

73ee235

ProjectRenderer_implement_LmmsExporter

ef3807e

AudioEngine_friend_class_ProjectRenderer

67858ca

ExportProjectDialog_implement_LmmsExporter

639cdc6

LmmsExporter_fix_errors

9313778

main_implement_LmmsExporter

502b287

MainWindow_implement_LmmsExporter

61a0639

AudioAlsa_reset

f548f74

AudioSndio_reset

821130d

AudioOss_reset

a0ff26d

AudioPulseAudio_reset

8abbfd2

AudioDevice_channel_count_set_to_2_in_static

57db1ee

AudioFileDevice_remove_channel_count

1ecffa6

AudioFileFlac_remove_channel_count

ec51c9a

AudioFileMP3_remove_channel_count

d3fb596

AudioFileOgg_remove_channel_count

061235f

AudioFileWave_remove_channel_count

ca9f6da

LmmsExporter_remove_channel_count_from_AudioFileDevice

a8071e3

AudioDevice_format_changes

1ac6c93

AudioFileFlac_fromat_changes

a15b34e

AudioFileDevice_format_changes

c61209c

AudioFileMP3_format_changes

db7e52d

AudioFileOgg_format_changes

ffdb807

AudioFileWave_format_changes

f0cf93d

LmmsExporter_format_changes

ff0c79f

szeli1 requested review from Rossmaxx and michaelgregorius August 23, 2024 09:43

Rossmaxx reviewed Aug 23, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove audio engine from exporting code #7452

Remove audio engine from exporting code #7452

szeli1 commented Aug 14, 2024 •

edited

Loading

Rossmaxx left a comment

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

szeli1 Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

szeli1 Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

szeli1 Aug 23, 2024

Rossmaxx Aug 23, 2024

Rossmaxx Aug 23, 2024

	static void clearS16Buffer(int_sample_t * _outbuf,
	static void clearS16Buffer(int_sample_t* _outbuf,

	const QString & outputFilename,
	const QString& outputFilename,

		@@ -240,6 +240,15 @@ void AudioEngine::stopProcessing()
		}


		void AudioEngine::startExporting(const struct qualitySettings& qs)

	( _output_buffer + frame * channels )[chnl] =
	(_output_buffer + frame * channels)[chnl] =

	void AudioDevice::clearS16Buffer(int_sample_t * _outbuf, const fpp_t _frames)
	void AudioDevice::clearS16Buffer(int_sample_t* _outbuf, const fpp_t _frames)

Remove audio engine from exporting code #7452

Are you sure you want to change the base?

Remove audio engine from exporting code #7452

Conversation

szeli1 commented Aug 14, 2024 • edited Loading

Rossmaxx left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

szeli1 commented Aug 14, 2024 •

edited

Loading