Added new AudioDeviceInfo struct, and populate a vector of them on QtPlayer initialization. This allows a user to overwrite the preferred audio device by using the setting PLAYBACK_AUDIO_DEVICE_NAME.

Author: jonoomph

include/AudioDeviceInfo.h

@@ -0,0 +1,43 @@
+/**
+ * @file
+ * @brief Header file for Audio Device Info struct
+ * @author Jonathan Thomas <[email protected]>
+ *
+ * @section LICENSE
+ *
+ * Copyright (c) 2008-2014 OpenShot Studios, LLC
+ * <http://www.openshotstudios.com/>. This file is part of
+ * OpenShot Library (libopenshot), an open-source project dedicated to
+ * delivering high quality video editing and animation solutions to the
+ * world. For more information visit <http://www.openshot.org/>.
+ *
+ * OpenShot Library (libopenshot) is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * OpenShot Library (libopenshot) 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef OPENSHOT_AUDIODEVICEINFO_H
+#define OPENSHOT_AUDIODEVICEINFO_H
+
+
+/**
+ * @brief This struct hold information about Audio Devices
+ *
+ * The type and name of the audio device.
+ */
+struct AudioDeviceInfo
+{
+	string name;
+	string type;
+};
+
+#endif

include/Qt/AudioPlaybackThread.h

@@ -32,6 +32,8 @@
 #include "../ReaderBase.h"
 #include "../RendererBase.h"
 #include "../AudioReaderSource.h"
+#include "../AudioDeviceInfo.h"
+#include "../Settings.h"
 
 namespace openshot
 {
@@ -66,8 +68,11 @@ namespace openshot
 		/// Error found during JUCE initialise method
 		string initialise_error;
 
-		/// Create or get an instance of this singleton (invoke the class with this method)
-		static AudioDeviceManagerSingleton * Instance(int numChannels);
+		/// List of valid audio device names
+		vector<AudioDeviceInfo> audio_device_names;
+
+		/// Override with no channels and no preferred audio device
+		static AudioDeviceManagerSingleton * Instance();
 
 		/// Public device manager property
 		AudioDeviceManager audioDeviceManager;
@@ -126,7 +131,10 @@ namespace openshot
 		int getSpeed() const { if (source) return source->getSpeed(); else return 1; }
 
 		/// Get Audio Error (if any)
-		string getError() { return AudioDeviceManagerSingleton::Instance(numChannels)->initialise_error; }
+		string getError() { return AudioDeviceManagerSingleton::Instance()->initialise_error; }
+
+		/// Get Audio Device Names (if any)
+		vector<AudioDeviceInfo> getAudioDeviceNames() { return AudioDeviceManagerSingleton::Instance()->audio_device_names; };
 
 		friend class PlayerPrivate;
 		friend class QtPlayer;

include/QtPlayer.h

@@ -62,6 +62,9 @@ namespace openshot
 	/// Get Error (if any)
 	string GetError();
 
+	/// Get Audio Devices from JUCE
+	vector<AudioDeviceInfo> GetAudioDeviceNames();
+
 	/// Play the video
 	void Play();
 

include/Settings.h

@@ -109,6 +109,9 @@ namespace openshot {
 		/// Which GPU to use to encode (0 is the first)
 		int HW_EN_DEVICE_SET = 0;
 
+		/// The audio device name to use during playback
+		string PLAYBACK_AUDIO_DEVICE_NAME = "";
+
 		/// Create or get an instance of this logger singleton (invoke the class with this method)
 		static Settings * Instance();
 	};

src/Qt/AudioPlaybackThread.cpp

@@ -35,7 +35,7 @@ namespace openshot
 	AudioDeviceManagerSingleton *AudioDeviceManagerSingleton::m_pInstance = NULL;
 
 	// Create or Get an instance of the device manager singleton
-	AudioDeviceManagerSingleton *AudioDeviceManagerSingleton::Instance(int numChannels)
+	AudioDeviceManagerSingleton *AudioDeviceManagerSingleton::Instance()
 	{
 		if (!m_pInstance) {
 			// Create the actual instance of device manager only once
@@ -44,16 +44,31 @@ namespace openshot
 			// Initialize audio device only 1 time
 			String error = m_pInstance->audioDeviceManager.initialise (
 					0, /* number of input channels */
-                    numChannels, /* number of output channels */
+					2, /* number of output channels */
 					0, /* no XML settings.. */
-					true  /* select default device on failure */);
+					true,  /* select default device on failure */
+					Settings::Instance()->PLAYBACK_AUDIO_DEVICE_NAME /* preferredDefaultDeviceName */);
 
 			// Persist any errors detected
 			if (error.isNotEmpty()) {
 				m_pInstance->initialise_error = error.toStdString();
 			} else {
 				m_pInstance->initialise_error = "";
 			}
+
+			// Get all audio device names
+			for (int i = 0; i < m_pInstance->audioDeviceManager.getAvailableDeviceTypes().size(); ++i)
+			{
+				const AudioIODeviceType* t = m_pInstance->audioDeviceManager.getAvailableDeviceTypes()[i];
+				const StringArray deviceNames = t->getDeviceNames ();
+
+				for (int j = 0; j < deviceNames.size (); ++j )
+				{
+					const String deviceName = deviceNames[j];
+					AudioDeviceInfo deviceInfo = {deviceName.toStdString(), t->getTypeName().toStdString()};
+					m_pInstance->audio_device_names.push_back(deviceInfo);
+				}
+			}
 		}
 
 		return m_pInstance;
@@ -149,7 +164,7 @@ namespace openshot
 
     			// Start new audio device (or get existing one)
     			// Add callback
-				AudioDeviceManagerSingleton::Instance(numChannels)->audioDeviceManager.addAudioCallback(&player);
+				AudioDeviceManagerSingleton::Instance()->audioDeviceManager.addAudioCallback(&player);
 
     			// Create TimeSliceThread for audio buffering
 				time_thread.startThread();
@@ -182,7 +197,7 @@ namespace openshot
 				transport.setSource(NULL);
 
 				player.setSource(NULL);
-				AudioDeviceManagerSingleton::Instance(0)->audioDeviceManager.removeAudioCallback(&player);
+				AudioDeviceManagerSingleton::Instance()->audioDeviceManager.removeAudioCallback(&player);
 
 				// Remove source
 				delete source;

src/QtPlayer.cpp

@@ -56,7 +56,7 @@ QtPlayer::~QtPlayer()
 void QtPlayer::CloseAudioDevice()
 {
 	// Close audio device (only do this once, when all audio playback is finished)
-	AudioDeviceManagerSingleton::Instance(0)->CloseAudioDevice();
+	AudioDeviceManagerSingleton::Instance()->CloseAudioDevice();
 }
 
 // Return any error string during initialization
@@ -69,6 +69,15 @@ string QtPlayer::GetError() {
 	}
 }
 
+/// Get Audio Devices from JUCE
+vector<AudioDeviceInfo> QtPlayer::GetAudioDeviceNames() {
+	if (reader && threads_started) {
+		return p->audioPlayback->getAudioDeviceNames();
+	} else {
+		return vector<AudioDeviceInfo>();
+	}
+}
+
 void QtPlayer::SetSource(const std::string &source)
 {
 	FFmpegReader *ffreader = new FFmpegReader(source);

src/Settings.cpp

@@ -51,7 +51,7 @@ Settings *Settings::Instance()
 		m_pInstance->DE_LIMIT_WIDTH_MAX = 1950;
 		m_pInstance->HW_DE_DEVICE_SET = 0;
 		m_pInstance->HW_EN_DEVICE_SET = 0;
-
+		m_pInstance->PLAYBACK_AUDIO_DEVICE_NAME = "";
 	}
 
 	return m_pInstance;

src/bindings/python/openshot.i

@@ -87,6 +87,7 @@
 #include "../../../include/Settings.h"
 #include "../../../include/Timeline.h"
 #include "../../../include/ZmqLogger.h"
+#include "../../../include/AudioDeviceInfo.h"
 
 %}
 
@@ -154,6 +155,7 @@
 %include "../../../include/Settings.h"
 %include "../../../include/Timeline.h"
 %include "../../../include/ZmqLogger.h"
+%include "../../../include/AudioDeviceInfo.h"
 
 #ifdef USE_IMAGEMAGICK
 	%include "../../../include/ImageReader.h"
@@ -187,4 +189,5 @@ namespace std {
  %template(FieldVector) vector<Field>;
  %template(MappedFrameVector) vector<MappedFrame>;
  %template(MappedMetadata) map<string, string>;
+ %template(AudioDeviceInfoVector) vector<AudioDeviceInfo>;
 }

src/bindings/ruby/openshot.i

@@ -91,6 +91,7 @@ namespace std {
 #include "../../../include/Settings.h"
 #include "../../../include/Timeline.h"
 #include "../../../include/ZmqLogger.h"
+#include "../../../include/AudioDeviceInfo.h"
 
 %}
 
@@ -147,6 +148,7 @@ namespace std {
 %include "../../../include/Settings.h"
 %include "../../../include/Timeline.h"
 %include "../../../include/ZmqLogger.h"
+%include "../../../include/AudioDeviceInfo.h"
 
 #ifdef USE_IMAGEMAGICK
 	%include "../../../include/ImageReader.h"
@@ -181,4 +183,5 @@ namespace std {
  %template(FieldVector) vector<Field>;
  %template(MappedFrameVector) vector<MappedFrame>;
  %template(MappedMetadata) map<string, string>;
+ %template(AudioDeviceInfoVector) vector<AudioDeviceInfo>;
 }