Merge branch 'master' into calf-updates

plugins/stk/mallets/mallets.h

@@ -36,6 +36,12 @@
 #include "note_play_handle.h"
 #include "led_checkbox.h"
 
+// As of Stk 4.4 all classes and types have been moved to the namespace "stk".
+// However in older versions this namespace does not exist, therefore declare it
+// so this plugin builds with all versions of Stk.
+namespace stk { } ;
+using namespace stk;
+
 
 class malletsSynth
 {

plugins/vestige/vestige.cpp

@@ -360,6 +360,11 @@ void VestigeInstrumentView::openPlugin()
 		engine::getMixer()->lock();
 		m_vi->loadFile( ofd.selectedFiles()[0] );
 		engine::getMixer()->unlock();
+		if( m_vi->m_plugin && m_vi->m_plugin->pluginWidget() )
+		{
+			m_vi->m_plugin->pluginWidget()->setWindowIcon(
+									PLUGIN_NAME::getIconPixmap( "logo" ) );
+		}
 	}
 }
 

plugins/vibed/vibed.cpp

@@ -241,7 +241,7 @@ void vibed::loadSettings( const QDomElement & _this )
 			float * shp = 0;
 			base64::decode( _this.attribute( "graph" +
 						QString::number( i ) ),
-						(char * *) &shp,
+						&shp,
 						&size );
 			// TODO: check whether size == 128 * sizeof( float ),
 			// otherwise me might and up in a segfault

plugins/vst_base/remote_vst_plugin.cpp

@@ -813,7 +813,7 @@ void RemoteVstPlugin::saveChunkToFile( const std::string & _file )
 
 void RemoteVstPlugin::loadChunkFromFile( const std::string & _file, int _len )
 {
-	char buf[_len];
+	char * buf = NULL;
 
 	void * chunk = NULL;
 	// various plugins need this in order to not crash when setting
@@ -823,7 +823,8 @@ void RemoteVstPlugin::loadChunkFromFile( const std::string & _file, int _len )
 	// allocated buffer big enough?
 	if( _len > actualLen )
 	{
-		// no, manually try our local buffer
+		// no, then manually allocate a buffer
+		buf = new char[_len];
 		chunk = buf;
 	}
 
@@ -831,6 +832,8 @@ void RemoteVstPlugin::loadChunkFromFile( const std::string & _file, int _len )
 	read( fd, chunk, _len );
 	close( fd );
 	pluginDispatch( 24, 0, _len, chunk );
+
+	delete[] buf;
 }