Merge branch 'stable-1.2'

data/projects/demos/CapDan/LICENSES.TXT

@@ -0,0 +1,15 @@
+* CapDan-ReggaeTry.mmpz
+  - Artistic 2.0
+  - https://lmms.io/lsp/index.php?action=show&file=1369
+
+* CapDan-ReggaetonTry.mmpz
+  - Artistic 2.0
+  - https://lmms.io/lsp/index.php?action=show&file=1370
+
+* CapDan-TwilightArea-OriginalByAlf42red.mmpz
+  - CC (by-sa)
+  - https://lmms.io/lsp/index.php?action=show&file=1439
+
+* CapDan-ZeroSumGame-OriginalByZakarra.mmpz
+  - Artistic 2.0
+  - https://lmms.io/lsp/index.php?action=show&file=1565

data/projects/demos/LICENSES.TXT

@@ -2,22 +2,6 @@
   - CC (by-sa)
   - https://lmms.io/lsp/index.php?action=show&file=819
 
-* CapDan-ReggaeTry.mmpz
-  - Artistic 2.0
-  - https://lmms.io/lsp/index.php?action=show&file=1369
-
-* CapDan-ReggaetonTry.mmpz
-  - Artistic 2.0
-  - https://lmms.io/lsp/index.php?action=show&file=1370
-
-* CapDan-TwilightArea-OriginalByAlf42red.mmpz
-  - CC (by-sa)
-  - https://lmms.io/lsp/index.php?action=show&file=1439
-
-* CapDan-ZeroSumGame-OriginalByZakarra.mmpz
-  - Artistic 2.0
-  - https://lmms.io/lsp/index.php?action=show&file=1565
-
 * EsoXLB-CPU.mmpz
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=723
@@ -34,6 +18,10 @@
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=581
 
+* Jousboxx-BuzzerBeater.mmpz
+  - CC BY-SA 4.0
+  - https://github.com/LMMS/lmms/pull/3482#issuecomment-293609866
+
 * Momo64-esp.mmpz
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=1534
@@ -50,6 +38,10 @@
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=1156
 
+* Popsip-Electric Dancer.mmpz
+  - Creative Commons (by-nc)
+  - https://lmms.io/lsp/?action=show&file=5414
+
 * Root84-Initialize.mmpz
   - Yellow openmusic
   - https://lmms.io/lsp/index.php?action=show&file=628
@@ -62,14 +54,6 @@
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=515
 
-* Skiessi-C64.mmpz
-  - CC (by sa)
-  - https://lmms.io/lsp/index.php?action=show&file=472
-
-* Skiessi-Onion.mmpz
-  - CC (by-sa)
-  - https://lmms.io/lsp/index.php?action=show&file=405
-
 * Socceroos-Progress.mmpz
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=1516
@@ -78,6 +62,10 @@
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=1060
 
+* Thaledric-Armageddon.mmpz
+  - Creative Commons (by-nc-sa)
+  - https://lmms.io/lsp/?action=show&file=1947
+
 * Thomasso-AxeFromThe80s.mmpz
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=474
@@ -85,7 +73,3 @@
 * unfa-Spoken.mmpz
   - CC (by-nc)
   - https://lmms.io/lsp/index.php?action=show&file=4929
-  
-* Jousboxx-BuzzerBeater.mmpz
-  - CC (by-sa)
-  - https://lmms.io/lsp/?action=show&file=10488

data/projects/demos/Skiessi/LICENSES.TXT

@@ -0,0 +1,7 @@
+* Skiessi-C64.mmpz
+  - CC (by sa)
+  - https://lmms.io/lsp/index.php?action=show&file=472
+
+* Skiessi-Onion.mmpz
+  - CC (by-sa)
+  - https://lmms.io/lsp/index.php?action=show&file=405

data/projects/shorties/LICENSES.TXT

@@ -1,3 +1,11 @@
+* Crunk(Demo).mmp
+  - Artistic 2.0
+  - https://lmms.io/lsp/?action=show&file=4093
+
+* DirtyLove.mmpz
+  - CC-BY-SA
+  - https://github.com/LMMS/lmms/pull/2727
+
 * Greshz-CoolSnip.mmpz
   - Artistic 2.0
   - https://lmms.io/lsp/index.php?action=show&file=1170

include/AudioJack.h

@@ -37,7 +37,6 @@
 #include <QtCore/QVector>
 #include <QtCore/QList>
 #include <QtCore/QMap>
-#include <QMutexLocker>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
@@ -108,7 +107,6 @@ private:
 
 	bool m_active;
 	bool m_stopped;
-	QMutex m_processingMutex;
 
 	MidiJack *m_midiClient;
 	QVector<jack_port_t *> m_outputPorts;

include/AudioPortAudio.h

@@ -145,7 +145,6 @@ private:
 	int m_outBufSize;
 
 	bool m_stopped;
-	QSemaphore m_stopSemaphore;
 
 } ;
 

include/AudioSoundIo.h

@@ -109,6 +109,8 @@ private:
 	fpp_t m_outBufFramesTotal;
 	fpp_t m_outBufFrameIndex;
 
+	bool m_stopped;
+
 	int m_disconnectErr;
 	void onBackendDisconnect(int err);
 

include/fifo_buffer.h

@@ -66,6 +66,12 @@ public:
 		return( element );
 	}
 
+	void waitUntilRead()
+	{
+		m_writer_sem.acquire( m_size );
+		m_writer_sem.release( m_size );
+	}
+
 	bool available()
 	{
 		return( m_reader_sem.available() );

plugins/VstEffect/VstEffect.cpp

@@ -95,9 +95,11 @@ bool VstEffect::processAudioBuffer( sampleFrame * _buf, const fpp_t _frames )
 		sampleFrame * buf = new sampleFrame[_frames];
 #endif
 		memcpy( buf, _buf, sizeof( sampleFrame ) * _frames );
-		m_pluginMutex.lock();
-		m_plugin->process( buf, buf );
-		m_pluginMutex.unlock();
+		if (m_pluginMutex.tryLock())
+		{
+			m_plugin->process( buf, buf );
+			m_pluginMutex.unlock();
+		}
 
 		double out_sum = 0.0;
 		const float w = wetLevel();

plugins/vestige/vestige.cpp

@@ -365,14 +365,12 @@ void vestigeInstrument::loadFile( const QString & _file )
 
 void vestigeInstrument::play( sampleFrame * _buf )
 {
-	m_pluginMutex.lock();
+	if (!m_pluginMutex.tryLock()) {return;}
 
 	const fpp_t frames = Engine::mixer()->framesPerPeriod();
 
 	if( m_plugin == NULL )
 	{
-		BufferManager::clear( _buf, frames );
-
 		m_pluginMutex.unlock();
 		return;
 	}

plugins/zynaddsubfx/ZynAddSubFx.cpp

@@ -325,7 +325,7 @@ QString ZynAddSubFxInstrument::nodeName() const
 
 void ZynAddSubFxInstrument::play( sampleFrame * _buf )
 {
-	m_pluginMutex.lock();
+	if (!m_pluginMutex.tryLock()) {return;}
 	if( m_remotePlugin )
 	{
 		m_remotePlugin->process( NULL, _buf );

src/core/Mixer.cpp

@@ -640,7 +640,7 @@ void Mixer::storeAudioDevice()
 
 void Mixer::restoreAudioDevice()
 {
-	if( m_oldAudioDev != NULL )
+	if( m_oldAudioDev && m_audioDev != m_oldAudioDev )
 	{
 		stopProcessing();
 		delete m_audioDev;
@@ -648,9 +648,9 @@ void Mixer::restoreAudioDevice()
 		m_audioDev = m_oldAudioDev;
 		emit sampleRateChanged();
 
-		m_oldAudioDev = NULL;
 		startProcessing();
 	}
+	m_oldAudioDev = NULL;
 }
 
 
@@ -1128,7 +1128,9 @@ void Mixer::fifoWriter::run()
 		write( buffer );
 	}
 
+	// Let audio backend stop processing
 	write( NULL );
+	m_fifo->waitUntilRead();
 }
 
 

src/core/audio/AudioJack.cpp

@@ -201,7 +201,6 @@ bool AudioJack::initJackClient()
 
 void AudioJack::startProcessing()
 {
-	QMutexLocker m( &m_processingMutex );
 	m_stopped = false;
 
 	if( m_active || m_client == NULL )
@@ -254,7 +253,6 @@ void AudioJack::startProcessing()
 
 void AudioJack::stopProcessing()
 {
-	QMutexLocker m( &m_processingMutex );
 	m_stopped = true;
 }
 
@@ -342,7 +340,6 @@ void AudioJack::renamePort( AudioPort * _port )
 
 int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
 {
-	QMutexLocker m( &m_processingMutex );
 
 	// do midi processing first so that midi input can
 	// add to the following sound processing
@@ -406,6 +403,7 @@ int AudioJack::processCallback( jack_nframes_t _nframes, void * _udata )
 			m_framesDoneInCurBuf = 0;
 			if( !m_framesToDoInCurBuf )
 			{
+				m_stopped = true;
 				break;
 			}
 		}

src/core/audio/AudioPortAudio.cpp

@@ -57,8 +57,7 @@ AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) :
 	m_paStream( NULL ),
 	m_wasPAInitError( false ),
 	m_outBuf( new surroundSampleFrame[mixer()->framesPerPeriod()] ),
-	m_outBufPos( 0 ),
-	m_stopSemaphore( 1 )
+	m_outBufPos( 0 )
 {
 	_success_ful = false;
 
@@ -167,8 +166,6 @@ AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) :
 	printf( "Input device: '%s' backend: '%s'\n", Pa_GetDeviceInfo( inDevIdx )->name, Pa_GetHostApiInfo( Pa_GetDeviceInfo( inDevIdx )->hostApi )->name );
 	printf( "Output device: '%s' backend: '%s'\n", Pa_GetDeviceInfo( outDevIdx )->name, Pa_GetHostApiInfo( Pa_GetDeviceInfo( outDevIdx )->hostApi )->name );
 
-	m_stopSemaphore.acquire();
-
 	// TODO: debug Mixer::pushInputFrames()
 	//m_supportsCapture = true;
 
@@ -181,7 +178,6 @@ AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) :
 AudioPortAudio::~AudioPortAudio()
 {
 	stopProcessing();
-	m_stopSemaphore.release();
 
 	if( !m_wasPAInitError )
 	{
@@ -212,8 +208,7 @@ void AudioPortAudio::stopProcessing()
 {
 	if( m_paStream && Pa_IsStreamActive( m_paStream ) )
 	{
-		m_stopSemaphore.acquire();
-		
+		m_stopped = true;
 		PaError err = Pa_StopStream( m_paStream );
 	
 		if( err != paNoError )
@@ -283,7 +278,6 @@ int AudioPortAudio::process_callback(
 			if( !frames )
 			{
 				m_stopped = true;
-				m_stopSemaphore.release();
 				memset( _outputBuffer, 0, _framesPerBuffer *
 					channels() * sizeof(float) );
 				return paComplete;

src/core/audio/AudioPulseAudio.cpp

@@ -103,6 +103,7 @@ void AudioPulseAudio::startProcessing()
 
 void AudioPulseAudio::stopProcessing()
 {
+	m_quit = true;
 	stopProcessingThread( this );
 }
 

src/core/audio/AudioSdl.cpp

@@ -278,6 +278,7 @@ void AudioSdl::sdlAudioCallback( Uint8 * _buf, int _len )
 			const fpp_t frames = getNextBuffer( m_outBuf );
 			if( !frames )
 			{
+				m_stopped = true;
 				memset( _buf, 0, _len );
 				return;
 			}

src/core/audio/AudioSoundIo.cpp

@@ -49,6 +49,7 @@ AudioSoundIo::AudioSoundIo( bool & outSuccessful, Mixer * _mixer ) :
 	m_disconnectErr = 0;
 	m_outBufFrameIndex = 0;
 	m_outBufFramesTotal = 0;
+	m_stopped = true;
 
 	m_soundio = soundio_create();
 	if (!m_soundio)
@@ -210,15 +211,18 @@ void AudioSoundIo::startProcessing()
 
 	m_outBuf = new surroundSampleFrame[m_outBufSize];
 
+	m_stopped = false;
 	int err;
 	if ((err = soundio_outstream_start(m_outstream)))
 	{
+		m_stopped = true;
 		fprintf(stderr, "soundio unable to start stream: %s\n", soundio_strerror(err));
 	}
 }
 
 void AudioSoundIo::stopProcessing()
 {
+	m_stopped = true;
 	if (m_outstream)
 	{
 		soundio_outstream_destroy(m_outstream);
@@ -244,6 +248,7 @@ void AudioSoundIo::underflowCallback()
 
 void AudioSoundIo::writeCallback(int frameCountMin, int frameCountMax)
 {
+	if (m_stopped) {return;}
 	const struct SoundIoChannelLayout *layout = &m_outstream->layout;
 	SoundIoChannelArea *areas;
 	int bytesPerSample = m_outstream->bytes_per_sample;
@@ -265,11 +270,27 @@ void AudioSoundIo::writeCallback(int frameCountMin, int frameCountMax)
 		if (!frameCount)
 			break;
 
+		
+		if (m_stopped)
+		{
+			for (int channel = 0; channel < layout->channel_count; ++channel)
+			{
+				memset(areas[channel].ptr, 0, bytesPerSample * frameCount);
+				areas[channel].ptr += areas[channel].step * frameCount;
+			}
+			continue;
+		}
+
 		for (int frame = 0; frame < frameCount; frame += 1)
 		{
 			if (m_outBufFrameIndex >= m_outBufFramesTotal)
 			{
 				m_outBufFramesTotal = getNextBuffer(m_outBuf);
+				if (m_outBufFramesTotal == 0)
+				{
+					m_stopped = true;
+					break;
+				}
 				m_outBufFrameIndex = 0;
 			}
 

src/tracks/SampleTrack.cpp

@@ -759,15 +759,12 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
 	m_volumeKnob->setVolumeKnob( true );
 	m_volumeKnob->setModel( &_t->m_volumeModel );
 	m_volumeKnob->setHintText( tr( "Channel volume:" ), "%" );
-	if( ConfigManager::inst()->value( "ui",
-					  "compacttrackbuttons" ).toInt() )
-	{
-		m_volumeKnob->move( DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT-2*24, 2 );
-	}
-	else
-	{
-		m_volumeKnob->move( DEFAULT_SETTINGS_WIDGET_WIDTH-2*24, 2 );
-	}
+
+	int settingsWidgetWidth = ConfigManager::inst()->
+					value( "ui", "compacttrackbuttons" ).toInt()
+				? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT
+				: DEFAULT_SETTINGS_WIDGET_WIDTH;
+	m_volumeKnob->move( settingsWidgetWidth - 2 * 24, 2 );
 	m_volumeKnob->setLabel( tr( "VOL" ) );
 	m_volumeKnob->show();
 
@@ -775,7 +772,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
 							tr( "Panning" ) );
 	m_panningKnob->setModel( &_t->m_panningModel );
 	m_panningKnob->setHintText( tr( "Panning:" ), "%" );
-	m_panningKnob->move( DEFAULT_SETTINGS_WIDGET_WIDTH-24, 2 );
+	m_panningKnob->move( settingsWidgetWidth - 24, 2 );
 	m_panningKnob->setLabel( tr( "PAN" ) );
 	m_panningKnob->show();