Adding default audio buffer size to libopenshot settings, and setting…

… default to 512. Also, adding some debugging output. This will allow users to override the default audio buffer size, to better customize for their system.
OpenShot · Dec 9, 2024 · a25513b · a25513b
1 parent ad5a600
commit a25513b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/AudioReaderSource.cpp b/src/AudioReaderSource.cpp
@@ -13,8 +13,6 @@
 #include "AudioReaderSource.h"
 #include "Exceptions.h"
 #include "Frame.h"
-#include "ZmqLogger.h"
-
 
 using namespace std;
 using namespace openshot;
@@ -44,8 +42,6 @@ void AudioReaderSource::getNextAudioBlock(const juce::AudioSourceChannelInfo& in
 		}
 
         while (remaining_samples > 0) {
-            ZmqLogger::Instance()->AppendDebugMethod("AudioReaderSource::getNextAudioBlock", "remaining_samples", remaining_samples);
-
             try {
                 // Get current frame object
                 if (reader) {

diff --git a/src/Qt/AudioPlaybackThread.cpp b/src/Qt/AudioPlaybackThread.cpp
@@ -59,9 +59,9 @@ namespace openshot
 
 			std::stringstream constructor_title;
 			constructor_title << "AudioDeviceManagerSingleton::Instance (default audio device type: " <<
-			Settings::Instance()->PLAYBACK_AUDIO_DEVICE_TYPE << ", default audio device name: " <<
-			Settings::Instance()->PLAYBACK_AUDIO_DEVICE_NAME << ")";
-			ZmqLogger::Instance()->AppendDebugMethod(constructor_title.str(), "channels", channels);
+				Settings::Instance()->PLAYBACK_AUDIO_DEVICE_TYPE << ", default audio device name: " <<
+				Settings::Instance()->PLAYBACK_AUDIO_DEVICE_NAME << ")";
+			ZmqLogger::Instance()->AppendDebugMethod(constructor_title.str(), "channels", channels, "buffer", Settings::Instance()->PLAYBACK_AUDIO_BUFFER_SIZE);
 
 			// Get preferred audio device type and name (if any - these can be blank)
 			openshot::AudioDeviceInfo requested_device = {Settings::Instance()->PLAYBACK_AUDIO_DEVICE_TYPE,
@@ -113,7 +113,7 @@ namespace openshot
 				AudioDeviceManager::AudioDeviceSetup deviceSetup = AudioDeviceManager::AudioDeviceSetup();
 				deviceSetup.inputChannels = 0;
 				deviceSetup.outputChannels = channels;
-				deviceSetup.bufferSize = 512;
+				deviceSetup.bufferSize = Settings::Instance()->PLAYBACK_AUDIO_BUFFER_SIZE;
 
 				// Loop through common sample rates, starting with the user's requested rate
 				// Not all sample rates are supported by audio devices, for example, many VMs

diff --git a/src/Settings.h b/src/Settings.h
@@ -103,6 +103,9 @@ namespace openshot {
 		/// The device type for the playback audio devices
 		std::string PLAYBACK_AUDIO_DEVICE_TYPE = "";
 
+		/// Size of playback buffer before audio playback starts
+		int PLAYBACK_AUDIO_BUFFER_SIZE = 512;
+
 		/// The current install path of OpenShot (needs to be set when using Timeline(path), since certain
 		/// paths depend on the location of OpenShot transitions and files)
 		std::string PATH_OPENSHOT_INSTALL = "";