Fix TripleOscillator preset previewing due to nonexistent waveform files

LMMS · Oct 17, 2018 · 2efd265 · 2efd265
1 parent b243160
commit 2efd265
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
@@ -308,7 +308,7 @@ class LMMS_EXPORT SampleBuffer : public QObject, public JournallingObject
 
 
 public slots:
-	void setAudioFile( const QString & _audio_file );
+	void setAudioFile(const QString & audioFile , bool ignoreError = false);
 	void setStartFrame( const f_cnt_t _s );
 	void setEndFrame( const f_cnt_t _e );
 	void setAmplification( float _a );
@@ -335,7 +335,7 @@ public slots:
 		return const_cast<sampleFrame*>(ptr);
 	}
 
-	void changeAudioFile (QString audioFile);
+	void changeAudioFile (QString audioFile, bool ignoreError);
 
 	static DataVector convertIntToFloat(int_sample_t * & _ibuf, f_cnt_t _frames, int _channels);
 

diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp
@@ -280,7 +280,7 @@ void TripleOscillator::loadSettings( const QDomElement & _this )
 		m_osc[i]->m_modulationAlgoModel.loadSettings( _this,
 					"modalgo" + QString::number( i+1 ) );
 		m_osc[i]->m_sampleBuffer->setAudioFile( _this.attribute(
-							"userwavefile" + is ) );
+							"userwavefile" + is ), true );
 	}
 }
 

diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
@@ -138,7 +138,7 @@ sample_rate_t SampleBuffer::mixerSampleRate()
 	return Engine::mixer ()->processingSampleRate ();
 }
 
-void SampleBuffer::changeAudioFile(QString audioFile)
+void SampleBuffer::changeAudioFile(QString audioFile, bool ignoreError)
 {
 	if (audioFile == "")
 		return;
@@ -214,7 +214,7 @@ void SampleBuffer::changeAudioFile(QString audioFile)
 
 	if (! fileLoadError) {
 		resetData (std::move(fileData), samplerate);
-	} else {
+	} else if (!ignoreError) {
 		QString title = tr( "Fail to open file" );
 		QString message = tr( "Audio files are limited to %1 MB "
 							  "in size and %2 minutes of playing time"
@@ -1016,10 +1016,10 @@ QString & SampleBuffer::toBase64( QString & _dst ) const
 }
 
 
-void SampleBuffer::setAudioFile( const QString & _audio_file )
+void SampleBuffer::setAudioFile(const QString & audioFile, bool ignoreError )
 {
-	m_audioFile = tryToMakeRelative(_audio_file);
-	changeAudioFile (_audio_file);
+	m_audioFile = tryToMakeRelative(audioFile);
+	changeAudioFile (audioFile, ignoreError);
 }