Sample Track Recording Stage One

include/AudioEngine.h

@@ -172,6 +172,8 @@ class LMMS_EXPORT AudioEngine : public QObject
 		return m_audioDev;
 	}
 
+	bool captureDeviceAvailable() const;
+
 
 	// audio-port-stuff
 	inline void addAudioPort(AudioPort * port)
@@ -355,6 +357,11 @@ class LMMS_EXPORT AudioEngine : public QObject
 	AudioDevice * tryAudioDevices();
 	MidiClient * tryMidiClients();
 
+	const AudioDevice* audioDev() const
+	{
+		return m_audioDev;
+	}
+
 	void renderStageNoteSetup();
 	void renderStageInstruments();
 	void renderStageEffects();

include/AudioSdl.h

@@ -39,7 +39,7 @@
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
-class QLineEdit;
+class QComboBox;
 
 namespace lmms
 {
@@ -66,8 +66,10 @@ class AudioSdl : public AudioDevice
 		void saveSettings() override;
 
 	private:
-		QLineEdit * m_device;
+		QComboBox* m_playbackDeviceComboBox = nullptr;
+		QComboBox* m_inputDeviceComboBox = nullptr;
 
+		static QString s_systemDefaultDevice;
 	} ;
 
 

include/SampleClipView.h

@@ -60,6 +60,7 @@ public slots:
 	void mouseDoubleClickEvent( QMouseEvent * ) override;
 	void paintEvent( QPaintEvent * ) override;
 
+	bool recordingCapabilitiesAvailable() const;
 
 private:
 	SampleClip * m_clip;

include/SampleRecordHandle.h

@@ -45,7 +45,7 @@ class Track;
 class SampleRecordHandle : public PlayHandle
 {
 public:
-	SampleRecordHandle( SampleClip* clip );
+	SampleRecordHandle(SampleClip* clip, TimePos startRecordTimeOffset);
 	~SampleRecordHandle() override;
 
 	void play( sampleFrame * _working_buffer ) override;
@@ -70,6 +70,9 @@ class SampleRecordHandle : public PlayHandle
 	PatternTrack* m_patternTrack;
 	SampleClip * m_clip;
 
+	// The offset from the start of m_track that the record has
+	// started from.
+	TimePos m_startRecordTimeOffset;
 } ;
 
 

src/core/AudioEngine.cpp

@@ -334,7 +334,7 @@ void AudioEngine::renderStageNoteSetup()
 
 		if( it != m_playHandles.end() )
 		{
-			( *it )->audioPort()->removePlayHandle( ( *it ) );
+			if ((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); }
 			if( ( *it )->type() == PlayHandle::Type::NotePlayHandle )
 			{
 				NotePlayHandleManager::release( (NotePlayHandle*) *it );
@@ -399,7 +399,7 @@ void AudioEngine::renderStageEffects()
 		}
 		if( ( *it )->isFinished() )
 		{
-			( *it )->audioPort()->removePlayHandle( ( *it ) );
+			if ((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); }
 			if( ( *it )->type() == PlayHandle::Type::NotePlayHandle )
 			{
 				NotePlayHandleManager::release( (NotePlayHandle*) *it );
@@ -666,6 +666,10 @@ void AudioEngine::restoreAudioDevice()
 }
 
 
+bool AudioEngine::captureDeviceAvailable() const
+{
+	return audioDev()->supportsCapture();
+}
 
 
 void AudioEngine::removeAudioPort(AudioPort * port)
@@ -689,7 +693,7 @@ bool AudioEngine::addPlayHandle( PlayHandle* handle )
 	if (handle->type() == PlayHandle::Type::InstrumentPlayHandle || !criticalXRuns())
 	{
 		m_newPlayHandles.push( handle );
-		handle->audioPort()->addPlayHandle( handle );
+		if (handle->audioPort()) { handle->audioPort()->addPlayHandle(handle); }
 		return true;
 	}
 
@@ -710,7 +714,7 @@ void AudioEngine::removePlayHandle(PlayHandle * ph)
 	// which were created in a thread different than the audio engine thread
 	if (ph->affinityMatters() && ph->affinity() == QThread::currentThread())
 	{
-		ph->audioPort()->removePlayHandle(ph);
+		if (ph->audioPort()) { ph->audioPort()->removePlayHandle(ph); }
 		bool removedFromList = false;
 		// Check m_newPlayHandles first because doing it the other way around
 		// creates a race condition
@@ -769,7 +773,7 @@ void AudioEngine::removePlayHandlesOfTypes(Track * track, PlayHandle::Types type
 	{
 		if ((*it)->isFromTrack(track) && ((*it)->type() & types))
 		{
-			( *it )->audioPort()->removePlayHandle( ( *it ) );
+			if ((*it)->audioPort()) { (*it)->audioPort()->removePlayHandle(*it); }
 			if( ( *it )->type() == PlayHandle::Type::NotePlayHandle )
 			{
 				NotePlayHandleManager::release( (NotePlayHandle*) *it );

src/core/DataFile.cpp

@@ -466,7 +466,17 @@ bool DataFile::copyResources(const QString& resourcesDir)
 				{
 					// Get absolute path to resource
 					bool error;
-					QString resPath = PathUtil::toAbsolute(el.attribute(*res), &error);
+					auto attribute = el.attribute(*res);
+
+					// Skip empty resources. In some cases, there might be an
+					// alternative way of actually representing the data (e.g. data element for SampleTCO)
+					if (attribute.isEmpty())
+					{
+						++res;
+						continue;
+					}
+
+					QString resPath = PathUtil::toAbsolute(attribute, &error);
 					// If we are running without the project loaded (from CLI), "local:" base
 					// prefixes aren't converted, so we need to convert it ourselves
 					if (error)

src/core/PlayHandle.cpp

@@ -39,7 +39,8 @@ PlayHandle::PlayHandle(const Type type, f_cnt_t offset) :
 		m_affinity(QThread::currentThread()),
 		m_playHandleBuffer(BufferManager::acquire()),
 		m_bufferReleased(true),
-		m_usesBuffer(true)
+		m_usesBuffer(true),
+		m_audioPort{nullptr}
 {
 }
 

src/core/SampleRecordHandle.cpp

@@ -36,13 +36,14 @@ namespace lmms
 {
 
 
-SampleRecordHandle::SampleRecordHandle( SampleClip* clip ) :
-	PlayHandle( Type::SamplePlayHandle ),
+SampleRecordHandle::SampleRecordHandle(SampleClip* clip, TimePos startRecordTimeOffset) :
+	PlayHandle(Type::SamplePlayHandle),
 	m_framesRecorded( 0 ),
 	m_minLength( clip->length() ),
 	m_track( clip->getTrack() ),
 	m_patternTrack( nullptr ),
-	m_clip( clip )
+	m_clip(clip),
+	m_startRecordTimeOffset{startRecordTimeOffset}
 {
 }
 
@@ -53,6 +54,8 @@ SampleRecordHandle::~SampleRecordHandle()
 {
 	if (!m_buffers.empty()) { m_clip->setSampleBuffer(createSampleBuffer()); }
 
+	m_clip->setStartTimeOffset(m_startRecordTimeOffset);
+
 	while( !m_buffers.empty() )
 	{
 		delete[] m_buffers.front().first;

src/core/audio/AudioSdl.cpp

@@ -28,6 +28,7 @@
 
 #include <QFormLayout>
 #include <QLineEdit>
+#include <QComboBox>
 #include <SDL.h>
 
 #include "AudioEngine.h"
@@ -36,6 +37,10 @@
 namespace lmms
 {
 
+constexpr char const* const SectionSDL = "audiosdl";
+constexpr char const* const PlaybackDeviceSDL = "device";
+constexpr char const* const InputDeviceSDL = "inputdevice";
+
 AudioSdl::AudioSdl( bool & _success_ful, AudioEngine*  _audioEngine ) :
 	AudioDevice( DEFAULT_CHANNELS, _audioEngine ),
 	m_outBuf( new surroundSampleFrame[audioEngine()->framesPerPeriod()] )
@@ -77,11 +82,19 @@ AudioSdl::AudioSdl( bool & _success_ful, AudioEngine*  _audioEngine ) :
   	SDL_AudioSpec actual; 
 
 #ifdef LMMS_HAVE_SDL2
-	m_outputDevice = SDL_OpenAudioDevice (nullptr,
-										  0,
-										  &m_audioHandle,
-										  &actual,
-										  0);
+	const auto playbackDevice = ConfigManager::inst()->value(SectionSDL, PlaybackDeviceSDL).toStdString();
+	const bool isDefaultPlayback = playbackDevice.empty();
+
+	// Try with the configured device
+	const auto playbackDeviceCStr = isDefaultPlayback ? nullptr : playbackDevice.c_str();
+	m_outputDevice = SDL_OpenAudioDevice(playbackDeviceCStr, 0, &m_audioHandle, &actual, 0);
+
+	// If we did not get a device ID try again with the default device if we did not try that before
+	if (m_outputDevice == 0 && !isDefaultPlayback)
+	{
+		m_outputDevice = SDL_OpenAudioDevice(nullptr, 0, &m_audioHandle, &actual, 0);
+	}
+
 	if (m_outputDevice == 0) {
 		qCritical( "Couldn't open SDL-audio: %s\n", SDL_GetError() );
 		return;
@@ -107,11 +120,19 @@ AudioSdl::AudioSdl( bool & _success_ful, AudioEngine*  _audioEngine ) :
 	m_inputAudioHandle = m_audioHandle;
 	m_inputAudioHandle.callback = sdlInputAudioCallback;
 
-	m_inputDevice = SDL_OpenAudioDevice (nullptr,
-										 1,
-										 &m_inputAudioHandle,
-										 &actual,
-										 0);
+	const auto inputDevice = ConfigManager::inst()->value(SectionSDL, InputDeviceSDL).toStdString();
+	const bool isDefaultInput = inputDevice.empty();
+
+	// Try with the configured device
+	const auto inputDeviceCStr = isDefaultInput ? nullptr : inputDevice.c_str();
+	m_inputDevice = SDL_OpenAudioDevice (inputDeviceCStr, 1, &m_inputAudioHandle, &actual, 0);
+
+	// If we did not get a device ID try again with the default device if we did not try that before
+	if (m_inputDevice == 0 && !isDefaultInput)
+	{
+		m_inputDevice = SDL_OpenAudioDevice(nullptr, 1, &m_inputAudioHandle, &actual, 0);
+	}
+
 	if (m_inputDevice != 0) {
 		m_supportsCapture = true;
 	} else {
@@ -282,24 +303,85 @@ void AudioSdl::sdlInputAudioCallback(Uint8 *_buf, int _len) {
 
 #endif
 
+QString AudioSdl::setupWidget::s_systemDefaultDevice = QObject::tr("[System Default]");
+
 AudioSdl::setupWidget::setupWidget( QWidget * _parent ) :
 	AudioDeviceSetupWidget( AudioSdl::name(), _parent )
 {
 	QFormLayout * form = new QFormLayout(this);
+	form->setRowWrapPolicy(QFormLayout::WrapLongRows);
+
+	m_playbackDeviceComboBox = new QComboBox(this);
+
+#ifdef LMMS_HAVE_SDL2
+	m_playbackDeviceComboBox->addItem(s_systemDefaultDevice);
+
+	const int numberOfPlaybackDevices = SDL_GetNumAudioDevices(0);
+	for (int i = 0; i < numberOfPlaybackDevices; ++i)
+	{
+		const QString deviceName = SDL_GetAudioDeviceName(i, 0);
+		m_playbackDeviceComboBox->addItem(deviceName);
+	}
+
+	const auto playbackDevice = ConfigManager::inst()->value(SectionSDL, PlaybackDeviceSDL);
+	m_playbackDeviceComboBox->setCurrentText(playbackDevice.isEmpty() ? s_systemDefaultDevice : playbackDevice);
+#endif
+
+	form->addRow(tr("Playback device"), m_playbackDeviceComboBox);
 
-	QString dev = ConfigManager::inst()->value( "audiosdl", "device" );
-	m_device = new QLineEdit( dev, this );
+	m_inputDeviceComboBox = new QComboBox(this);
 
-	form->addRow(tr("Device"), m_device);
+#ifdef LMMS_HAVE_SDL2
+	m_inputDeviceComboBox->addItem(s_systemDefaultDevice);
+
+	const int numberOfInputDevices = SDL_GetNumAudioDevices(1);
+	for (int i = 0; i < numberOfInputDevices; ++i)
+	{
+		const QString deviceName = SDL_GetAudioDeviceName(i, 1);
+		m_inputDeviceComboBox->addItem(deviceName);
+	}
+
+	// Set the current device to the one in the configuration
+	const auto inputDevice = ConfigManager::inst()->value(SectionSDL, InputDeviceSDL);
+	if (inputDevice.isEmpty())
+	{
+		m_inputDeviceComboBox->setCurrentText(s_systemDefaultDevice);
+	}
+	else
+	{
+		m_inputDeviceComboBox->setCurrentText(inputDevice);
+	}
+#endif
+
+	form->addRow(tr("Input device"), m_inputDeviceComboBox);
 }
 
 
 
 
 void AudioSdl::setupWidget::saveSettings()
 {
-	ConfigManager::inst()->setValue( "audiosdl", "device",
-							m_device->text() );
+	const auto currentPlaybackDevice = m_playbackDeviceComboBox->currentText();
+	if (currentPlaybackDevice == s_systemDefaultDevice)
+	{
+		// Represent the default input device with an empty string
+		ConfigManager::inst()->setValue(SectionSDL, PlaybackDeviceSDL, "");
+	}
+	else if (!currentPlaybackDevice.isEmpty())
+	{
+		ConfigManager::inst()->setValue(SectionSDL, PlaybackDeviceSDL, currentPlaybackDevice);
+	}
+
+	const auto currentInputDevice = m_inputDeviceComboBox->currentText();
+	if (currentInputDevice == s_systemDefaultDevice)
+	{
+		// Represent the default input device with an empty string
+		ConfigManager::inst()->setValue(SectionSDL, InputDeviceSDL, "");
+	}
+	else if (!currentInputDevice.isEmpty())
+	{
+		ConfigManager::inst()->setValue(SectionSDL, InputDeviceSDL, currentInputDevice);
+	}
 }