File lmms-0.4.13-crippled_stk.patch of Package lmms
Index: plugins/stk/mallets/mallets.cpp
===================================================================
--- plugins/stk/mallets/mallets.cpp.orig
+++ plugins/stk/mallets/mallets.cpp
@@ -30,7 +30,6 @@
#include "BandedWG.h"
#include "ModalBar.h"
-#include "TubeBell.h"
#include "engine.h"
#include "gui_templates.h"
@@ -111,10 +110,6 @@ malletsInstrument::malletsInstrument( In
m_presetsModel.addItem( tr( "Clump" ) );
m_scalers.append( 4.0 );
- // TubeBell
- m_presetsModel.addItem( tr( "Tubular Bells" ) );
- m_scalers.append( 1.8 );
-
// BandedWG
m_presetsModel.addItem( tr( "Uniform Bar" ) );
m_scalers.append( 25.0 );
@@ -145,13 +140,6 @@ void malletsInstrument::saveSettings( QD
m_vibratoFreqModel.saveSettings( _doc, _this, "vib_freq" );
m_stickModel.saveSettings( _doc, _this, "stick_mix" );
- // TubeBell
- m_modulatorModel.saveSettings( _doc, _this, "modulator" );
- m_crossfadeModel.saveSettings( _doc, _this, "crossfade" );
- m_lfoSpeedModel.saveSettings( _doc, _this, "lfo_speed" );
- m_lfoDepthModel.saveSettings( _doc, _this, "lfo_depth" );
- m_adsrModel.saveSettings( _doc, _this, "adsr" );
-
// BandedWG
m_pressureModel.saveSettings( _doc, _this, "pressure" );
m_motionModel.saveSettings( _doc, _this, "motion" );
@@ -175,13 +163,6 @@ void malletsInstrument::loadSettings( co
m_vibratoFreqModel.loadSettings( _this, "vib_freq" );
m_stickModel.loadSettings( _this, "stick_mix" );
- // TubeBell
- m_modulatorModel.loadSettings( _this, "modulator" );
- m_crossfadeModel.loadSettings( _this, "crossfade" );
- m_lfoSpeedModel.loadSettings( _this, "lfo_speed" );
- m_lfoDepthModel.loadSettings( _this, "lfo_depth" );
- m_adsrModel.loadSettings( _this, "adsr" );
-
// BandedWG
m_pressureModel.loadSettings( _this, "pressure" );
m_motionModel.loadSettings( _this, "motion" );
@@ -235,19 +216,6 @@ void malletsInstrument::playNote( notePl
(Uint8) m_spreadModel.value(),
engine::getMixer()->processingSampleRate() );
}
- else if( p == 9 )
- {
- _n->m_pluginData = new malletsSynth( freq,
- vel,
- p,
- m_lfoDepthModel.value(),
- m_modulatorModel.value(),
- m_crossfadeModel.value(),
- m_lfoSpeedModel.value(),
- m_adsrModel.value(),
- (Uint8) m_spreadModel.value(),
- engine::getMixer()->processingSampleRate() );
- }
else
{
_n->m_pluginData = new malletsSynth( freq,
@@ -311,10 +279,6 @@ malletsInstrumentView::malletsInstrument
m_modalBarWidget = setupModalBarControls( this );
setWidgetBackground( m_modalBarWidget, "artwork" );
- m_tubeBellWidget = setupTubeBellControls( this );
- setWidgetBackground( m_tubeBellWidget, "artwork" );
- m_tubeBellWidget->hide();
-
m_bandedWGWidget = setupBandedWGControls( this );
setWidgetBackground( m_bandedWGWidget, "artwork" );
m_bandedWGWidget->hide();
@@ -388,43 +352,6 @@ QWidget * malletsInstrumentView::setupMo
-
-QWidget * malletsInstrumentView::setupTubeBellControls( QWidget * _parent )
-{
- QWidget * widget = new QWidget( _parent );
- widget->setFixedSize( 250, 250 );
-
- m_modulatorKnob = new knob( knobBright_26, widget );
- m_modulatorKnob->setLabel( tr( "Modulator" ) );
- m_modulatorKnob->move( 145, 24 );
- m_modulatorKnob->setHintText( tr( "Modulator:" ) + " ", "" );
-
- m_crossfadeKnob = new knob( knobBright_26, widget );
- m_crossfadeKnob->setLabel( tr( "Crossfade" ) );
- m_crossfadeKnob->move( 195, 24 );
- m_crossfadeKnob->setHintText( tr( "Crossfade:" ) + " ", "" );
-
- m_lfoSpeedKnob = new knob( knobBright_26, widget );
- m_lfoSpeedKnob->setLabel( tr( "LFO Speed" ) );
- m_lfoSpeedKnob->move( 56, 86 );
- m_lfoSpeedKnob->setHintText( tr( "LFO Speed:" ) + " ", "" );
-
- m_lfoDepthKnob = new knob( knobBright_26, widget );
- m_lfoDepthKnob->setLabel( tr( "LFO Depth" ) );
- m_lfoDepthKnob->move( 117, 86 );
- m_lfoDepthKnob->setHintText( tr( "LFO Depth:" ) + " ", "" );
-
- m_adsrKnob = new knob( knobBright_26, widget );
- m_adsrKnob->setLabel( tr( "ADSR" ) );
- m_adsrKnob->move( 178, 86 );
- m_adsrKnob->setHintText( tr( "ADSR:" ) + " ", "" );
-
- return( widget );
-}
-
-
-
-
QWidget * malletsInstrumentView::setupBandedWGControls( QWidget * _parent )
{
// BandedWG
@@ -468,11 +395,6 @@ void malletsInstrumentView::modelChanged
m_vibratoGainKnob->setModel( &inst->m_vibratoGainModel );
m_vibratoFreqKnob->setModel( &inst->m_vibratoFreqModel );
m_stickKnob->setModel( &inst->m_stickModel );
- m_modulatorKnob->setModel( &inst->m_modulatorModel );
- m_crossfadeKnob->setModel( &inst->m_crossfadeModel );
- m_lfoSpeedKnob->setModel( &inst->m_lfoSpeedModel );
- m_lfoDepthKnob->setModel( &inst->m_lfoDepthModel );
- m_adsrKnob->setModel( &inst->m_adsrModel );
m_pressureKnob->setModel( &inst->m_pressureModel );
m_motionKnob->setModel( &inst->m_motionModel );
m_vibratoKnob->setModel( &inst->m_vibratoModel );
@@ -493,7 +415,6 @@ void malletsInstrumentView::changePreset
printf("malletsInstrumentView %d\n", _preset);
if( _preset < 9 )
{
- m_tubeBellWidget->hide();
m_bandedWGWidget->hide();
m_modalBarWidget->show();
}
@@ -501,12 +422,10 @@ void malletsInstrumentView::changePreset
{
m_modalBarWidget->hide();
m_bandedWGWidget->hide();
- m_tubeBellWidget->show();
}
else
{
m_modalBarWidget->hide();
- m_tubeBellWidget->hide();
m_bandedWGWidget->show();
}
}
@@ -559,52 +478,6 @@ malletsSynth::malletsSynth( const StkFlo
-
-// TubeBell
-malletsSynth::malletsSynth( const StkFloat _pitch,
- const StkFloat _velocity,
- const int _preset,
- const StkFloat _control1,
- const StkFloat _control2,
- const StkFloat _control4,
- const StkFloat _control11,
- const StkFloat _control128,
- const Uint8 _delay,
- const sample_rate_t _sample_rate )
-{
- try
- {
- Stk::setSampleRate( _sample_rate );
- Stk::setRawwavePath( configManager::inst()->stkDir()
- .toAscii().constData() );
-
- m_voice = new TubeBell();
-
- m_voice->controlChange( 1, _control1 );
- m_voice->controlChange( 2, _control2 );
- m_voice->controlChange( 4, _control4 );
- m_voice->controlChange( 11, _control11 );
- m_voice->controlChange( 128, _control128 );
-
- m_voice->noteOn( _pitch, _velocity );
- }
- catch( ... )
- {
- m_voice = NULL;
- }
-
- m_delay = new StkFloat[256];
- m_delayRead = 0;
- m_delayWrite = _delay;
- for( Uint16 i = 0; i < 256; i++ )
- {
- m_delay[i] = 0.0;
- }
-}
-
-
-
-
// BandedWG
malletsSynth::malletsSynth( const StkFloat _pitch,
const StkFloat _velocity,
Index: plugins/stk/mallets/mallets.h
===================================================================
--- plugins/stk/mallets/mallets.h.orig
+++ plugins/stk/mallets/mallets.h
@@ -58,18 +58,6 @@ public:
const Uint8 _delay,
const sample_rate_t _sample_rate );
- // TubeBell
- malletsSynth( const StkFloat _pitch,
- const StkFloat _velocity,
- const int _preset,
- const StkFloat _control1,
- const StkFloat _control2,
- const StkFloat _control4,
- const StkFloat _control11,
- const StkFloat _control128,
- const Uint8 _delay,
- const sample_rate_t _sample_rate );
-
// BandedWG
malletsSynth( const StkFloat _pitch,
const StkFloat _velocity,
@@ -199,7 +187,6 @@ private:
void setWidgetBackground( QWidget * _widget, const QString & _pic );
QWidget * setupModalBarControls( QWidget * _parent );
- QWidget * setupTubeBellControls( QWidget * _parent );
QWidget * setupBandedWGControls( QWidget * _parent );
QWidget * m_modalBarWidget;
@@ -209,13 +196,6 @@ private:
knob * m_vibratoFreqKnob;
knob * m_stickKnob;
- QWidget * m_tubeBellWidget;
- knob * m_modulatorKnob;
- knob * m_crossfadeKnob;
- knob * m_lfoSpeedKnob;
- knob * m_lfoDepthKnob;
- knob * m_adsrKnob;
-
QWidget * m_bandedWGWidget;
knob * m_pressureKnob;
knob * m_motionKnob;
