Merge pull request #127 from wongcc966422/LFOBitinvaderVibedCustomWaveforms

Make LFO controller, Bit Invader and Vibed accept custom waveforms
This commit is contained in:
Tobias Doerffel
2014-01-24 14:56:04 -08:00
11 changed files with 147 additions and 70 deletions

View File

@@ -75,6 +75,8 @@ protected:
sample_t (*m_sampleFunction)( const float );
private:
SampleBuffer * m_userDefSampleBuffer;
protected slots:
void updateSampleFunction();
@@ -107,6 +109,13 @@ protected:
automatableButtonGroup * m_waveBtnGrp;
automatableButtonGroup * m_multiplierBtnGrp;
private:
pixmapButton * m_userWaveBtn;
private slots:
void askUserDefWave();
} ;
#endif

View File

@@ -172,7 +172,8 @@ public:
return m_data;
}
QString openAudioFile() const;
QString openAudioFile() const;
QString openAndSetAudioFile();
QString & toBase64( QString & _dst ) const;

View File

@@ -151,7 +151,7 @@ public slots:
void setWaveToSaw();
void setWaveToSquare();
void setWaveToNoise();
//void setWaveToUser( );
QString setWaveToUser( );
void smooth();
void normalize();