Merge commit 'f7741f184f83e6b9e2f081d39efffb2c499962f6' into ed_refac

plugins/LadspaEffect/swh/imp_1199.c

@@ -74,7 +74,11 @@ static fftw_real *real_in, *real_out, *comp_in, *comp_out;
 
 unsigned int fft_length[IMPULSES];
 
+#ifdef __clang__
+void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
+#else
 inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
+#endif
 {
   fftw_real impulse_time[MAX_FFT_LENGTH];
 #ifdef FFTW3

plugins/audio_file_processor/audio_file_processor.cpp

@@ -742,6 +742,7 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView( QWidget * _parent, int _
 	m_to( m_sampleBuffer.frames() ),
 	m_last_from( 0 ),
 	m_last_to( 0 ),
+	m_last_amp( 0 ),
 	m_startKnob( 0 ),
 	m_endKnob( 0 ),
 	m_loopKnob( 0 ),

plugins/zynaddsubfx/LocalZynAddSubFx.cpp

@@ -89,6 +89,7 @@ LocalZynAddSubFx::LocalZynAddSubFx() :
 LocalZynAddSubFx::~LocalZynAddSubFx()
 {
 	delete m_master;
+	delete m_ioEngine;
 
 	if( --s_instanceCount == 0 )
 	{