From d0483d91388274ba13cab9a32dce4e22fc26f016 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 15 Jun 2008 12:48:24 +0000 Subject: [PATCH] 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 | 2 +- plugins/stk/voices/b3/b3_model.cpp | 4 +-- plugins/stk/voices/b3/b3_model.h | 4 +-- .../voices/bandedwg/bandedwg_instrument.cpp | 2 +- .../stk/voices/bandedwg/bandedwg_model.cpp | 4 +-- plugins/stk/voices/bandedwg/bandedwg_model.h | 4 +-- .../blow_bottle/blow_bottle_instrument.cpp | 2 +- .../voices/blow_bottle/blow_bottle_model.cpp | 4 +-- .../voices/blow_bottle/blow_bottle_model.h | 4 +-- .../voices/blow_hole/blow_hole_instrument.cpp | 2 +- .../stk/voices/blow_hole/blow_hole_model.cpp | 4 +-- .../stk/voices/blow_hole/blow_hole_model.h | 4 +-- plugins/stk/voices/bowed/bowed_instrument.cpp | 2 +- plugins/stk/voices/bowed/bowed_model.cpp | 4 +-- plugins/stk/voices/bowed/bowed_model.h | 4 +-- plugins/stk/voices/brass/brass_instrument.cpp | 2 +- plugins/stk/voices/brass/brass_model.cpp | 4 +-- plugins/stk/voices/brass/brass_model.h | 4 +-- .../voices/clarinet/clarinet_instrument.cpp | 2 +- .../stk/voices/clarinet/clarinet_model.cpp | 4 +-- plugins/stk/voices/clarinet/clarinet_model.h | 4 +-- plugins/stk/voices/flute/flute_instrument.cpp | 2 +- plugins/stk/voices/flute/flute_model.cpp | 4 +-- plugins/stk/voices/flute/flute_model.h | 4 +-- .../voices/fmvoices/fmvoices_instrument.cpp | 2 +- .../stk/voices/fmvoices/fmvoices_model.cpp | 4 +-- plugins/stk/voices/fmvoices/fmvoices_model.h | 4 +-- plugins/stk/voices/include/stk_instrument.h | 10 ++++---- plugins/stk/voices/include/stk_model.h | 6 ++--- plugins/stk/voices/include/stk_processor.h | 4 +-- plugins/stk/voices/include/stk_voice.h | 25 ++++++++----------- plugins/stk/voices/metal/metal_instrument.cpp | 2 +- plugins/stk/voices/metal/metal_model.cpp | 4 +-- plugins/stk/voices/metal/metal_model.h | 4 +-- plugins/stk/voices/moog/moog_instrument.cpp | 2 +- plugins/stk/voices/moog/moog_model.cpp | 4 +-- plugins/stk/voices/moog/moog_model.h | 4 +-- .../voices/percflute/percflute_instrument.cpp | 2 +- .../stk/voices/percflute/percflute_model.cpp | 4 +-- .../stk/voices/percflute/percflute_model.h | 4 +-- .../voices/resonate/resonate_instrument.cpp | 2 +- .../stk/voices/resonate/resonate_model.cpp | 4 +-- plugins/stk/voices/resonate/resonate_model.h | 4 +-- .../stk/voices/rhodey/rhodey_instrument.cpp | 2 +- plugins/stk/voices/rhodey/rhodey_model.cpp | 4 +-- plugins/stk/voices/rhodey/rhodey_model.h | 4 +-- plugins/stk/voices/src/stk_model.cpp | 4 +-- .../voices/tubebell/tubebell_instrument.cpp | 2 +- .../stk/voices/tubebell/tubebell_model.cpp | 4 +-- plugins/stk/voices/tubebell/tubebell_model.h | 4 +-- .../stk/voices/wurley/wurley_instrument.cpp | 2 +- plugins/stk/voices/wurley/wurley_model.cpp | 4 +-- plugins/stk/voices/wurley/wurley_model.h | 4 +-- 53 files changed, 102 insertions(+), 107 deletions(-) diff --git a/plugins/stk/voices/b3/b3_instrument.cpp b/plugins/stk/voices/b3/b3_instrument.cpp index d1e621486..762ee87ac 100644 --- a/plugins/stk/voices/b3/b3_instrument.cpp +++ b/plugins/stk/voices/b3/b3_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor b3_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/b3/b3_model.cpp b/plugins/stk/voices/b3/b3_model.cpp index a1738546f..416d8e03e 100644 --- a/plugins/stk/voices/b3/b3_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/b3/b3_model.h b/plugins/stk/voices/b3/b3_model.h index d427c1fa8..5dcad0e5a 100644 --- a/plugins/stk/voices/b3/b3_model.h +++ b/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; diff --git a/plugins/stk/voices/bandedwg/bandedwg_instrument.cpp b/plugins/stk/voices/bandedwg/bandedwg_instrument.cpp index fcaf3a70f..3463273a4 100644 --- a/plugins/stk/voices/bandedwg/bandedwg_instrument.cpp +++ b/plugins/stk/voices/bandedwg/bandedwg_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor bandedwg_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/bandedwg/bandedwg_model.cpp b/plugins/stk/voices/bandedwg/bandedwg_model.cpp index 1d8de189e..0a13f53c8 100644 --- a/plugins/stk/voices/bandedwg/bandedwg_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/bandedwg/bandedwg_model.h b/plugins/stk/voices/bandedwg/bandedwg_model.h index fd65b7bcf..eab3e1c49 100644 --- a/plugins/stk/voices/bandedwg/bandedwg_model.h +++ b/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; diff --git a/plugins/stk/voices/blow_bottle/blow_bottle_instrument.cpp b/plugins/stk/voices/blow_bottle/blow_bottle_instrument.cpp index 3890df7b4..647adb37c 100644 --- a/plugins/stk/voices/blow_bottle/blow_bottle_instrument.cpp +++ b/plugins/stk/voices/blow_bottle/blow_bottle_instrument.cpp @@ -46,7 +46,7 @@ plugin::descriptor blowbottle_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/blow_bottle/blow_bottle_model.cpp b/plugins/stk/voices/blow_bottle/blow_bottle_model.cpp index 8e304907a..7d8739f02 100644 --- a/plugins/stk/voices/blow_bottle/blow_bottle_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/blow_bottle/blow_bottle_model.h b/plugins/stk/voices/blow_bottle/blow_bottle_model.h index 52d9dee08..2dee5d91a 100644 --- a/plugins/stk/voices/blow_bottle/blow_bottle_model.h +++ b/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; diff --git a/plugins/stk/voices/blow_hole/blow_hole_instrument.cpp b/plugins/stk/voices/blow_hole/blow_hole_instrument.cpp index 903770647..c04b41864 100644 --- a/plugins/stk/voices/blow_hole/blow_hole_instrument.cpp +++ b/plugins/stk/voices/blow_hole/blow_hole_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor blowhole_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/blow_hole/blow_hole_model.cpp b/plugins/stk/voices/blow_hole/blow_hole_model.cpp index d0f753666..644f06361 100644 --- a/plugins/stk/voices/blow_hole/blow_hole_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/blow_hole/blow_hole_model.h b/plugins/stk/voices/blow_hole/blow_hole_model.h index 302081a7f..5d8ec20f0 100644 --- a/plugins/stk/voices/blow_hole/blow_hole_model.h +++ b/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; diff --git a/plugins/stk/voices/bowed/bowed_instrument.cpp b/plugins/stk/voices/bowed/bowed_instrument.cpp index 0e9267023..f509d463a 100644 --- a/plugins/stk/voices/bowed/bowed_instrument.cpp +++ b/plugins/stk/voices/bowed/bowed_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor bowed_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/bowed/bowed_model.cpp b/plugins/stk/voices/bowed/bowed_model.cpp index e5d9cab66..16df264e1 100644 --- a/plugins/stk/voices/bowed/bowed_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/bowed/bowed_model.h b/plugins/stk/voices/bowed/bowed_model.h index 7fd67a895..c04cb5678 100644 --- a/plugins/stk/voices/bowed/bowed_model.h +++ b/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; diff --git a/plugins/stk/voices/brass/brass_instrument.cpp b/plugins/stk/voices/brass/brass_instrument.cpp index 744817af8..87f52e50c 100644 --- a/plugins/stk/voices/brass/brass_instrument.cpp +++ b/plugins/stk/voices/brass/brass_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor brass_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/brass/brass_model.cpp b/plugins/stk/voices/brass/brass_model.cpp index ffb08173b..d5ba16a76 100644 --- a/plugins/stk/voices/brass/brass_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/brass/brass_model.h b/plugins/stk/voices/brass/brass_model.h index 1bdecc609..9b9bca080 100644 --- a/plugins/stk/voices/brass/brass_model.h +++ b/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; diff --git a/plugins/stk/voices/clarinet/clarinet_instrument.cpp b/plugins/stk/voices/clarinet/clarinet_instrument.cpp index bc4b54777..92b30f689 100644 --- a/plugins/stk/voices/clarinet/clarinet_instrument.cpp +++ b/plugins/stk/voices/clarinet/clarinet_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor clarinet_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/clarinet/clarinet_model.cpp b/plugins/stk/voices/clarinet/clarinet_model.cpp index c1d2fdac1..f50e44fb7 100644 --- a/plugins/stk/voices/clarinet/clarinet_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/clarinet/clarinet_model.h b/plugins/stk/voices/clarinet/clarinet_model.h index 2636ccb39..a8698208a 100644 --- a/plugins/stk/voices/clarinet/clarinet_model.h +++ b/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; diff --git a/plugins/stk/voices/flute/flute_instrument.cpp b/plugins/stk/voices/flute/flute_instrument.cpp index 20d4ed31e..87a92a6d5 100644 --- a/plugins/stk/voices/flute/flute_instrument.cpp +++ b/plugins/stk/voices/flute/flute_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor flute_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/flute/flute_model.cpp b/plugins/stk/voices/flute/flute_model.cpp index 3c1e06640..40cca4722 100644 --- a/plugins/stk/voices/flute/flute_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/flute/flute_model.h b/plugins/stk/voices/flute/flute_model.h index a5a74c8ff..810950571 100644 --- a/plugins/stk/voices/flute/flute_model.h +++ b/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; diff --git a/plugins/stk/voices/fmvoices/fmvoices_instrument.cpp b/plugins/stk/voices/fmvoices/fmvoices_instrument.cpp index ebb6280ea..734b098e4 100644 --- a/plugins/stk/voices/fmvoices/fmvoices_instrument.cpp +++ b/plugins/stk/voices/fmvoices/fmvoices_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor fmvoices_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/fmvoices/fmvoices_model.cpp b/plugins/stk/voices/fmvoices/fmvoices_model.cpp index f742e905d..ab3adea19 100644 --- a/plugins/stk/voices/fmvoices/fmvoices_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/fmvoices/fmvoices_model.h b/plugins/stk/voices/fmvoices/fmvoices_model.h index 031da3dfb..c99834f36 100644 --- a/plugins/stk/voices/fmvoices/fmvoices_model.h +++ b/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; diff --git a/plugins/stk/voices/include/stk_instrument.h b/plugins/stk/voices/include/stk_instrument.h index 0a1d41bd0..a88681947 100644 --- a/plugins/stk/voices/include/stk_instrument.h +++ b/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::~stkInstrument() { delete m_voice; delete m_model; - delete[] m_buffer; } @@ -106,12 +105,13 @@ stkInstrument::~stkInstrument() template inline void stkInstrument::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 ); } diff --git a/plugins/stk/voices/include/stk_model.h b/plugins/stk/voices/include/stk_model.h index 6e7e62bbf..7a67c89a5 100644 --- a/plugins/stk/voices/include/stk_model.h +++ b/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( 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 diff --git a/plugins/stk/voices/include/stk_processor.h b/plugins/stk/voices/include/stk_processor.h index 412ab0f85..d9ae72d4f 100644 --- a/plugins/stk/voices/include/stk_processor.h +++ b/plugins/stk/voices/include/stk_processor.h @@ -109,7 +109,7 @@ template setActive( FALSE ); m_velocitySensitiveLPF = - new basicFilters<>( engine::getMixer()->sampleRate() ); + new basicFilters<>( engine::getMixer()->processingSampleRate() ); m_velocitySensitiveLPF->setFilterType( basicFilters<>::LOWPASS ); } @@ -140,7 +140,7 @@ template setActive( FALSE ); m_velocitySensitiveLPF = - new basicFilters<>( engine::getMixer()->sampleRate() ); + new basicFilters<>( engine::getMixer()->processingSampleRate() ); m_velocitySensitiveLPF->setFilterType( basicFilters<>::LOWPASS ); } diff --git a/plugins/stk/voices/include/stk_voice.h b/plugins/stk/voices/include/stk_voice.h index 1c246329e..05d87677f 100644 --- a/plugins/stk/voices/include/stk_voice.h +++ b/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 stkVoice::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::~stkVoice() template -sampleFrame * FASTCALL stkVoice::playNote( - notePlayHandle * _n, +void stkVoice::playNote( notePlayHandle * _n, MODEL * _model, sampleFrame * _buffer, const fpp_t _frames ) @@ -109,14 +106,14 @@ sampleFrame * FASTCALL stkVoice::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::playNote( // Don't do anything if no voices are available. if( m_processor == NULL ) { - return( _buffer ); + return; } } @@ -167,7 +164,7 @@ sampleFrame * FASTCALL stkVoice::playNote( // Initialize the number of frames for the portamento // transition. m_portamentoFrames = static_cast( - engine::getMixer()->sampleRate() * + engine::getMixer()->processingSampleRate() * _model->portamento()->value() / 1000.0f ); @@ -177,7 +174,7 @@ sampleFrame * FASTCALL stkVoice::playNote( if( _model->randomizeAttack()->value() ) { m_totalAttackFrames = static_cast( - engine::getMixer()->sampleRate() * + engine::getMixer()->processingSampleRate() * _model->randomizeLength()->value() / 1000.0f ); @@ -218,7 +215,7 @@ sampleFrame * FASTCALL stkVoice::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::playNote( { m_portamentoFrames -= _frames; } - - return( _buffer ); } diff --git a/plugins/stk/voices/metal/metal_instrument.cpp b/plugins/stk/voices/metal/metal_instrument.cpp index 1a08f49c6..a48025b27 100644 --- a/plugins/stk/voices/metal/metal_instrument.cpp +++ b/plugins/stk/voices/metal/metal_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor metal_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/metal/metal_model.cpp b/plugins/stk/voices/metal/metal_model.cpp index bd9b84301..3bbcf712f 100644 --- a/plugins/stk/voices/metal/metal_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/metal/metal_model.h b/plugins/stk/voices/metal/metal_model.h index 7bdb3024c..db3e3028f 100644 --- a/plugins/stk/voices/metal/metal_model.h +++ b/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; diff --git a/plugins/stk/voices/moog/moog_instrument.cpp b/plugins/stk/voices/moog/moog_instrument.cpp index 917cb5035..f707b633d 100644 --- a/plugins/stk/voices/moog/moog_instrument.cpp +++ b/plugins/stk/voices/moog/moog_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor moog_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/moog/moog_model.cpp b/plugins/stk/voices/moog/moog_model.cpp index 0919627db..152cd179e 100644 --- a/plugins/stk/voices/moog/moog_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/moog/moog_model.h b/plugins/stk/voices/moog/moog_model.h index e904d9d41..b1a2897f7 100644 --- a/plugins/stk/voices/moog/moog_model.h +++ b/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; diff --git a/plugins/stk/voices/percflute/percflute_instrument.cpp b/plugins/stk/voices/percflute/percflute_instrument.cpp index 2331f59a7..752420d23 100644 --- a/plugins/stk/voices/percflute/percflute_instrument.cpp +++ b/plugins/stk/voices/percflute/percflute_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor percflute_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/percflute/percflute_model.cpp b/plugins/stk/voices/percflute/percflute_model.cpp index 7eef710f6..648298a84 100644 --- a/plugins/stk/voices/percflute/percflute_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/percflute/percflute_model.h b/plugins/stk/voices/percflute/percflute_model.h index 5d4c62112..9643dea98 100644 --- a/plugins/stk/voices/percflute/percflute_model.h +++ b/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; diff --git a/plugins/stk/voices/resonate/resonate_instrument.cpp b/plugins/stk/voices/resonate/resonate_instrument.cpp index 2b2a18c92..39e81ef0f 100644 --- a/plugins/stk/voices/resonate/resonate_instrument.cpp +++ b/plugins/stk/voices/resonate/resonate_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor resonate_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/resonate/resonate_model.cpp b/plugins/stk/voices/resonate/resonate_model.cpp index cc7a383f3..c7c47b1e4 100644 --- a/plugins/stk/voices/resonate/resonate_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/resonate/resonate_model.h b/plugins/stk/voices/resonate/resonate_model.h index bf2b648ee..2318f41f7 100644 --- a/plugins/stk/voices/resonate/resonate_model.h +++ b/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; diff --git a/plugins/stk/voices/rhodey/rhodey_instrument.cpp b/plugins/stk/voices/rhodey/rhodey_instrument.cpp index 853c5babc..f73635970 100644 --- a/plugins/stk/voices/rhodey/rhodey_instrument.cpp +++ b/plugins/stk/voices/rhodey/rhodey_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor rhodey_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/rhodey/rhodey_model.cpp b/plugins/stk/voices/rhodey/rhodey_model.cpp index 472d03291..a03afb8d6 100644 --- a/plugins/stk/voices/rhodey/rhodey_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/rhodey/rhodey_model.h b/plugins/stk/voices/rhodey/rhodey_model.h index 9be409fb7..a8201305d 100644 --- a/plugins/stk/voices/rhodey/rhodey_model.h +++ b/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; diff --git a/plugins/stk/voices/src/stk_model.cpp b/plugins/stk/voices/src/stk_model.cpp index 1bc8d042d..6ccdd211e 100644 --- a/plugins/stk/voices/src/stk_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/tubebell/tubebell_instrument.cpp b/plugins/stk/voices/tubebell/tubebell_instrument.cpp index 000d2ec0d..94e439d97 100644 --- a/plugins/stk/voices/tubebell/tubebell_instrument.cpp +++ b/plugins/stk/voices/tubebell/tubebell_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor tubebell_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/tubebell/tubebell_model.cpp b/plugins/stk/voices/tubebell/tubebell_model.cpp index a8df61bc6..05bbf54b3 100644 --- a/plugins/stk/voices/tubebell/tubebell_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/tubebell/tubebell_model.h b/plugins/stk/voices/tubebell/tubebell_model.h index ab10f05cd..ec7919ebd 100644 --- a/plugins/stk/voices/tubebell/tubebell_model.h +++ b/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; diff --git a/plugins/stk/voices/wurley/wurley_instrument.cpp b/plugins/stk/voices/wurley/wurley_instrument.cpp index f924deed3..508850ee3 100644 --- a/plugins/stk/voices/wurley/wurley_instrument.cpp +++ b/plugins/stk/voices/wurley/wurley_instrument.cpp @@ -45,7 +45,7 @@ plugin::descriptor wurley_plugin_descriptor = "Danny McRae ", 0x0100, plugin::Instrument, - new QPixmap( PLUGIN_NAME::getIconPixmap( "logo" ) ), + new pluginPixmapLoader( "logo" ), NULL } ; diff --git a/plugins/stk/voices/wurley/wurley_model.cpp b/plugins/stk/voices/wurley/wurley_model.cpp index 8d12e23ed..e220c9116 100644 --- a/plugins/stk/voices/wurley/wurley_model.cpp +++ b/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" ); diff --git a/plugins/stk/voices/wurley/wurley_model.h b/plugins/stk/voices/wurley/wurley_model.h index 949b1f0cf..9928e5c3b 100644 --- a/plugins/stk/voices/wurley/wurley_model.h +++ b/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;