made STK-voices-plugins compile after they've not been maintained for a while

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1130 0778d3d1-df1d-0410-868b-ea421aaaa00d

plugins/stk/voices/b3/b3_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor b3_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/b3/b3_model.cpp

@@ -63,7 +63,7 @@ b3Model::~b3Model()
 
 
 
-void FASTCALL b3Model::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void b3Model::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_operator4->saveSettings( _doc, _parent, "operator4" );
@@ -76,7 +76,7 @@ void FASTCALL b3Model::saveSettings( QDomDocument & _doc, QDomElement & _parent
 	
 	
 	
-void FASTCALL b3Model::loadSettings( const QDomElement & _this )
+void b3Model::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_operator4->loadSettings( _this, "operator4" );

plugins/stk/voices/b3/b3_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	virtual void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_operator4;

plugins/stk/voices/bandedwg/bandedwg_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor bandedwg_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/bandedwg/bandedwg_model.cpp

@@ -69,7 +69,7 @@ bandedWGModel::~bandedWGModel()
 
 
 
-void FASTCALL bandedWGModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void bandedWGModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_bowPressure->saveSettings( _doc, _parent, "bowpressure" );
@@ -84,7 +84,7 @@ void FASTCALL bandedWGModel::saveSettings( QDomDocument & _doc, QDomElement & _p
 	
 	
 	
-void FASTCALL bandedWGModel::loadSettings( const QDomElement & _this )
+void bandedWGModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_bowPressure->loadSettings( _this, "bowpressure" );

plugins/stk/voices/bandedwg/bandedwg_model.h

@@ -83,9 +83,9 @@ public:
 		return( m_sound );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	virtual void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_bowPressure;

plugins/stk/voices/blow_bottle/blow_bottle_instrument.cpp

@@ -46,7 +46,7 @@ plugin::descriptor blowbottle_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/blow_bottle/blow_bottle_model.cpp

@@ -58,7 +58,7 @@ blowBottleModel::~blowBottleModel()
 
 
 
-void FASTCALL blowBottleModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void blowBottleModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_noiseGain->saveSettings( _doc, _parent, "noisegain" );
@@ -69,7 +69,7 @@ void FASTCALL blowBottleModel::saveSettings( QDomDocument & _doc, QDomElement &
 	
 	
 	
-void FASTCALL blowBottleModel::loadSettings( const QDomElement & _this )
+void blowBottleModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_noiseGain->loadSettings( _this, "noisegain" );

plugins/stk/voices/blow_bottle/blow_bottle_model.h

@@ -49,9 +49,9 @@ public:
 	inline floatModel * vibratoFrequency( void ) { return( m_vibratoFrequency ); }
 	inline floatModel * vibratoGain( void ) { return( m_vibratoGain ); }
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_noiseGain;

plugins/stk/voices/blow_hole/blow_hole_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor blowhole_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/blow_hole/blow_hole_model.cpp

@@ -63,7 +63,7 @@ blowHoleModel::~blowHoleModel()
 
 
 
-void FASTCALL blowHoleModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void blowHoleModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_reedStiffness->saveSettings( _doc, _parent, "reedstiffness" );
@@ -76,7 +76,7 @@ void FASTCALL blowHoleModel::saveSettings( QDomDocument & _doc, QDomElement & _p
 	
 	
 	
-void FASTCALL blowHoleModel::loadSettings( const QDomElement & _this )
+void blowHoleModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_reedStiffness->loadSettings( _this, "reedstiffness" );

plugins/stk/voices/blow_hole/blow_hole_model.h

@@ -52,9 +52,9 @@ public:
 	inline floatModel * registerState( void ) { return( m_registerState ); }
 	inline floatModel * breathPressure( void ) { return( m_breathPressure ); }
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_reedStiffness;

plugins/stk/voices/bowed/bowed_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor bowed_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/bowed/bowed_model.cpp

@@ -60,7 +60,7 @@ bowedModel::~bowedModel()
 
 
 
-void FASTCALL bowedModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void bowedModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_bowPressure->saveSettings( _doc, _parent, "bowpressure" );
@@ -72,7 +72,7 @@ void FASTCALL bowedModel::saveSettings( QDomDocument & _doc, QDomElement & _pare
 	
 	
 	
-void FASTCALL bowedModel::loadSettings( const QDomElement & _this )
+void bowedModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_bowPressure->loadSettings( _this, "bowpressure" );

plugins/stk/voices/bowed/bowed_model.h

@@ -65,9 +65,9 @@ public:
 		return( m_vibratoGain );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_bowPressure;

plugins/stk/voices/brass/brass_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor brass_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/brass/brass_model.cpp

@@ -60,7 +60,7 @@ brassModel::~brassModel()
 
 
 
-void FASTCALL brassModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void brassModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_lipTension->saveSettings( _doc, _parent, "liptension" );
@@ -72,7 +72,7 @@ void FASTCALL brassModel::saveSettings( QDomDocument & _doc, QDomElement & _pare
 	
 	
 	
-void FASTCALL brassModel::loadSettings( const QDomElement & _this )
+void brassModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_lipTension->loadSettings( _this, "liptension" );

plugins/stk/voices/brass/brass_model.h

@@ -65,9 +65,9 @@ public:
 		return( m_vibratoGain );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_lipTension;

plugins/stk/voices/clarinet/clarinet_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor clarinet_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/clarinet/clarinet_model.cpp

@@ -63,7 +63,7 @@ clarinetModel::~clarinetModel()
 
 
 
-void FASTCALL clarinetModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void clarinetModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_reedStiffness->saveSettings( _doc, _parent, "reedstiffness" );
@@ -76,7 +76,7 @@ void FASTCALL clarinetModel::saveSettings( QDomDocument & _doc, QDomElement & _p
 	
 	
 	
-void FASTCALL clarinetModel::loadSettings( const QDomElement & _this )
+void clarinetModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_reedStiffness->loadSettings( _this, "reedstiffness" );

plugins/stk/voices/clarinet/clarinet_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_breathPressure );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_reedStiffness;

plugins/stk/voices/flute/flute_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor flute_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/flute/flute_model.cpp

@@ -63,7 +63,7 @@ fluteModel::~fluteModel()
 
 
 
-void FASTCALL fluteModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void fluteModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_jetDelay->saveSettings( _doc, _parent, "reedstiffness" );
@@ -76,7 +76,7 @@ void FASTCALL fluteModel::saveSettings( QDomDocument & _doc, QDomElement & _pare
 	
 	
 	
-void FASTCALL fluteModel::loadSettings( const QDomElement & _this )
+void fluteModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_jetDelay->loadSettings( _this, "reedstiffness" );

plugins/stk/voices/flute/flute_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_breathPressure );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_jetDelay;

plugins/stk/voices/fmvoices/fmvoices_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor fmvoices_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/fmvoices/fmvoices_model.cpp

@@ -63,7 +63,7 @@ fmvoicesModel::~fmvoicesModel()
 
 
 
-void FASTCALL fmvoicesModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void fmvoicesModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_vowel->saveSettings( _doc, _parent, "vowel" );
@@ -76,7 +76,7 @@ void FASTCALL fmvoicesModel::saveSettings( QDomDocument & _doc, QDomElement & _p
 	
 	
 	
-void FASTCALL fmvoicesModel::loadSettings( const QDomElement & _this )
+void fmvoicesModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_vowel->loadSettings( _this, "vowel" );

plugins/stk/voices/fmvoices/fmvoices_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_vowel;

plugins/stk/voices/include/stk_instrument.h

@@ -39,7 +39,7 @@ public:
 			Uint8 _polyphony = 64 );
 	virtual ~stkInstrument();
 	
-	void playNote( notePlayHandle * _n, bool _try_parallelizing );
+	void playNote( notePlayHandle * _n, bool _try_parallelizing, sampleFrame * _buf );
 
 	void deleteNotePluginData( notePlayHandle * _n );
 
@@ -97,7 +97,6 @@ stkInstrument<PROCESSOR, MODEL>::~stkInstrument()
 {
 	delete m_voice;
 	delete m_model;
-	delete[] m_buffer;
 }
 
 
@@ -106,12 +105,13 @@ stkInstrument<PROCESSOR, MODEL>::~stkInstrument()
 template <class PROCESSOR, class MODEL>
 inline void stkInstrument<PROCESSOR, MODEL>::playNote( 
 						notePlayHandle * _n,
-						bool _try_parallelizing )
+						bool _try_parallelizing,
+						sampleFrame * _buf )
 {
 	m_frames = _n->framesLeftForCurrentPeriod();
 		
-	m_buffer = m_voice->playNote( _n, m_model, m_buffer, m_frames );
-	getInstrumentTrack()->processAudioBuffer( m_buffer, m_frames, _n );
+	m_voice->playNote( _n, m_model, _buf, m_frames );
+	getInstrumentTrack()->processAudioBuffer( _buf, m_frames, _n );
 }
 
 

plugins/stk/voices/include/stk_model.h

@@ -27,7 +27,7 @@
 
 #include "Instrmnt.h"
 
-#include "automatable_model_templates.h"
+#include "automatable_model.h"
 #include "basic_filters.h"
 
 
@@ -159,8 +159,8 @@ public:
 				static_cast<float>( RAND_MAX ) - 0.5f ) );
 	}
 	
-	virtual void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void FASTCALL loadSettings( const QDomElement & _this );
+	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	virtual void loadSettings( const QDomElement & _this );
  
 private:
 	boolModel * m_monophonic;		// multiple voice indicator

plugins/stk/voices/include/stk_processor.h

@@ -109,7 +109,7 @@ template <class MODEL, class STKVOICE>
 	setActive( FALSE );
 		
 	m_velocitySensitiveLPF = 
-			new basicFilters<>( engine::getMixer()->sampleRate() );
+		new basicFilters<>( engine::getMixer()->processingSampleRate() );
 	
 	m_velocitySensitiveLPF->setFilterType( basicFilters<>::LOWPASS );
 }	
@@ -140,7 +140,7 @@ template <class MODEL, class STKVOICE>
 	setActive( FALSE );
 		
 	m_velocitySensitiveLPF = 
-			new basicFilters<>( engine::getMixer()->sampleRate() );
+		new basicFilters<>( engine::getMixer()->processingSampleRate() );
 	
 	m_velocitySensitiveLPF->setFilterType( basicFilters<>::LOWPASS );
 }	

plugins/stk/voices/include/stk_voice.h

@@ -35,10 +35,8 @@ public:
 	stkVoice( Uint8 _polyphony = 64 );
 	virtual ~stkVoice();
 	
-	sampleFrame * FASTCALL playNote( notePlayHandle * _n,
-						MODEL * _model,
-						sampleFrame * _buffer,
-						const fpp_t _frames );
+	void playNote( notePlayHandle * _n, MODEL * _model,
+				sampleFrame * _buffer, const fpp_t _frames );
 
 	void setMissingFile( bool _state );
 
@@ -76,7 +74,7 @@ template <class PROCESSOR, class MODEL>
 stkVoice<PROCESSOR, MODEL>::stkVoice( Uint8 _polyphony ):
 	m_lastFrequency( 440.0f ),
 	m_polyphony( _polyphony ),
-	m_sampleRate( engine::getMixer()->sampleRate() ),
+	m_sampleRate( engine::getMixer()->processingSampleRate() ),
 	m_portamentoFrames( 0 )
 {
 	for( m_voiceIndex = 0; m_voiceIndex < m_polyphony; m_voiceIndex++ )
@@ -100,8 +98,7 @@ stkVoice<PROCESSOR, MODEL>::~stkVoice()
 
 
 template <class PROCESSOR, class MODEL>
-sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote( 
-							notePlayHandle * _n,
+void stkVoice<PROCESSOR, MODEL>::playNote( notePlayHandle * _n,
 							MODEL * _model,
 							sampleFrame * _buffer,
 							const fpp_t _frames )
@@ -109,14 +106,14 @@ sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote(
 	// Don't do anything if STK isn't installed properly.
 	if( m_filesMissing )
 	{
-		return _buffer;
+		return;
 	}
 	
 	// Don't do anything if the instrument is release triggered and we 
 	// haven't released yet.
 	if( _model->releaseTriggered()->value() && !_n->released() )
 	{
-		return _buffer;
+		return;
 	}
 	
 	// If it's a new note, we need to get a voice.
@@ -149,7 +146,7 @@ sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote(
 			// Don't do anything if no voices are available.
 			if( m_processor == NULL )
 			{
-				return( _buffer );
+				return;
 			}
 		}
 		
@@ -167,7 +164,7 @@ sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote(
 		// Initialize the number of frames for the portamento
 		// transition.
 		m_portamentoFrames = static_cast<int>( 
-				engine::getMixer()->sampleRate() * 
+				engine::getMixer()->processingSampleRate() * 
 				_model->portamento()->value() / 
 					1000.0f );
 		
@@ -177,7 +174,7 @@ sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote(
 		if( _model->randomizeAttack()->value() )
 		{
 			m_totalAttackFrames = static_cast<int>( 
-					engine::getMixer()->sampleRate() *
+					engine::getMixer()->processingSampleRate() *
 					_model->randomizeLength()->value() /
 						1000.0f );
 			
@@ -218,7 +215,7 @@ sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote(
 			m_processor->velocitySensitiveLPF()->calcFilterCoeffs( 
 					pow( 10.0f, m_processor->velocity() +
 						m_processor->deltaVelocity() ) *
-					engine::getMixer()->sampleRate() / 20.0f,
+					engine::getMixer()->processingSampleRate() / 20.0f,
 					_model->velocitySensitiveQ()->value() );
 			m_processor->velocitySensitiveLPF()->clearHistory();
 		}
@@ -352,8 +349,6 @@ sampleFrame * FASTCALL stkVoice<PROCESSOR, MODEL>::playNote(
 	{
 		m_portamentoFrames -= _frames;
 	}
-	
-	return( _buffer );
 }
 
 

plugins/stk/voices/metal/metal_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor metal_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/metal/metal_model.cpp

@@ -63,7 +63,7 @@ metalModel::~metalModel()
 
 
 
-void FASTCALL metalModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void metalModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_index->saveSettings( _doc, _parent, "index" );
@@ -76,7 +76,7 @@ void FASTCALL metalModel::saveSettings( QDomDocument & _doc, QDomElement & _pare
 	
 	
 	
-void FASTCALL metalModel::loadSettings( const QDomElement & _this )
+void metalModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_index->loadSettings( _this, "index" );

plugins/stk/voices/metal/metal_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_index;

plugins/stk/voices/moog/moog_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor moog_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/moog/moog_model.cpp

@@ -60,7 +60,7 @@ moogModel::~moogModel()
 
 
 
-void FASTCALL moogModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void moogModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_filterQ->saveSettings( _doc, _parent, "filterq" );
@@ -72,7 +72,7 @@ void FASTCALL moogModel::saveSettings( QDomDocument & _doc, QDomElement & _paren
 	
 	
 	
-void FASTCALL moogModel::loadSettings( const QDomElement & _this )
+void moogModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_filterQ->loadSettings( _this, "filterq" );

plugins/stk/voices/moog/moog_model.h

@@ -65,9 +65,9 @@ public:
 		return( m_vibratoGain );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_filterQ;

plugins/stk/voices/percflute/percflute_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor percflute_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/percflute/percflute_model.cpp

@@ -63,7 +63,7 @@ percfluteModel::~percfluteModel()
 
 
 
-void FASTCALL percfluteModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void percfluteModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_index->saveSettings( _doc, _parent, "index" );
@@ -76,7 +76,7 @@ void FASTCALL percfluteModel::saveSettings( QDomDocument & _doc, QDomElement & _
 	
 	
 	
-void FASTCALL percfluteModel::loadSettings( const QDomElement & _this )
+void percfluteModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_index->loadSettings( _this, "index" );

plugins/stk/voices/percflute/percflute_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_index;

plugins/stk/voices/resonate/resonate_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor resonate_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/resonate/resonate_model.cpp

@@ -60,7 +60,7 @@ resonateModel::~resonateModel()
 
 
 
-void FASTCALL resonateModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void resonateModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_resonanceFrequency->saveSettings( _doc, _parent, "resonancefrequency" );
@@ -72,7 +72,7 @@ void FASTCALL resonateModel::saveSettings( QDomDocument & _doc, QDomElement & _p
 	
 	
 	
-void FASTCALL resonateModel::loadSettings( const QDomElement & _this )
+void resonateModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_resonanceFrequency->loadSettings( _this, "resonancefrequency" );

plugins/stk/voices/resonate/resonate_model.h

@@ -65,9 +65,9 @@ public:
 		return( m_zeroRadii );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_resonanceFrequency;

plugins/stk/voices/rhodey/rhodey_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor rhodey_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/rhodey/rhodey_model.cpp

@@ -63,7 +63,7 @@ rhodeyModel::~rhodeyModel()
 
 
 
-void FASTCALL rhodeyModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void rhodeyModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_index->saveSettings( _doc, _parent, "index" );
@@ -76,7 +76,7 @@ void FASTCALL rhodeyModel::saveSettings( QDomDocument & _doc, QDomElement & _par
 	
 	
 	
-void FASTCALL rhodeyModel::loadSettings( const QDomElement & _this )
+void rhodeyModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_index->loadSettings( _this, "index" );

plugins/stk/voices/rhodey/rhodey_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_index;

plugins/stk/voices/src/stk_model.cpp

@@ -80,7 +80,7 @@ stkModel::~stkModel()
 
 
 
-void FASTCALL stkModel::saveSettings( QDomDocument & _doc, QDomElement & _parent ) 
+void stkModel::saveSettings( QDomDocument & _doc, QDomElement & _parent ) 
 {
 	m_monophonic->saveSettings( _doc, _parent, "monophonic" );
 	m_portamento->saveSettings( _doc, _parent, "portamento" );
@@ -101,7 +101,7 @@ void FASTCALL stkModel::saveSettings( QDomDocument & _doc, QDomElement & _parent
 
 
 
-void FASTCALL stkModel::loadSettings( const QDomElement & _this ) 
+void stkModel::loadSettings( const QDomElement & _this ) 
 {
 	m_monophonic->loadSettings( _this, "monophonic" );
 	m_portamento->loadSettings( _this, "portamento" );

plugins/stk/voices/tubebell/tubebell_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor tubebell_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/tubebell/tubebell_model.cpp

@@ -63,7 +63,7 @@ tubebellModel::~tubebellModel()
 
 
 
-void FASTCALL tubebellModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void tubebellModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_index->saveSettings( _doc, _parent, "index" );
@@ -76,7 +76,7 @@ void FASTCALL tubebellModel::saveSettings( QDomDocument & _doc, QDomElement & _p
 	
 	
 	
-void FASTCALL tubebellModel::loadSettings( const QDomElement & _this )
+void tubebellModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_index->loadSettings( _this, "index" );

plugins/stk/voices/tubebell/tubebell_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_index;

plugins/stk/voices/wurley/wurley_instrument.cpp

@@ -45,7 +45,7 @@ plugin::descriptor wurley_plugin_descriptor =
 	"Danny McRae <khjklujn/at/users.sf.net>",
 	0x0100,
 	plugin::Instrument,
-	new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ),
+	new pluginPixmapLoader( "logo" ),
 	NULL
 } ;
 

plugins/stk/voices/wurley/wurley_model.cpp

@@ -63,7 +63,7 @@ wurleyModel::~wurleyModel()
 
 
 
-void FASTCALL wurleyModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
+void wurleyModel::saveSettings( QDomDocument & _doc, QDomElement & _parent )
 {
 	stkModel::saveSettings( _doc, _parent );
 	m_index->saveSettings( _doc, _parent, "index" );
@@ -76,7 +76,7 @@ void FASTCALL wurleyModel::saveSettings( QDomDocument & _doc, QDomElement & _par
 	
 	
 	
-void FASTCALL wurleyModel::loadSettings( const QDomElement & _this )
+void wurleyModel::loadSettings( const QDomElement & _this )
 {
 	stkModel::loadSettings( _this );
 	m_index->loadSettings( _this, "index" );

plugins/stk/voices/wurley/wurley_model.h

@@ -71,9 +71,9 @@ public:
 		return( m_adsrTarget );
 	}
 	
-	void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent );
 	
-	void FASTCALL loadSettings( const QDomElement & _this );
+	void loadSettings( const QDomElement & _this );
 
 private:
 	floatModel * m_index;