diff --git a/ChangeLog b/ChangeLog index 651700abe..dcbb1d4a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,14 @@ * plugins/sf2_player/sf2_player.cpp: * plugins/kicker/kicker.cpp: Update plugins to use displayName for children + + +M plugins/vibed/vibed.cpp +M plugins/triple_oscillator/triple_oscillator.h +M plugins/triple_oscillator/triple_oscillator.cpp +M data/themes/default/add.png +M Makefile.am + 2008-06-05 Tobias Doerffel diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index 877f3a16e..55191f3f2 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -60,22 +60,22 @@ plugin::descriptor malletsstk_plugin_descriptor = malletsInstrument::malletsInstrument( instrumentTrack * _instrument_track ): instrument( _instrument_track, &malletsstk_plugin_descriptor ), - m_hardnessModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_positionModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_vibratoGainModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_vibratoFreqModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_stickModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_modulatorModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_crossfadeModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_lfoSpeedModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_lfoDepthModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_adsrModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_pressureModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_motionModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_velocityModel(64.0f, 0.0f, 128.0f, 0.1f, this), - m_strikeModel( FALSE, this ), + m_hardnessModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Hardness" )), + m_positionModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Position" )), + m_vibratoGainModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Vibrato Gain" )), + m_vibratoFreqModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Vibrato Freq" )), + m_stickModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Stick Mix" )), + m_modulatorModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Modulator" )), + m_crossfadeModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Crossfade" )), + m_lfoSpeedModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "LFO Speed" )), + m_lfoDepthModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "LFO Depth" )), + m_adsrModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "ADSR" )), + m_pressureModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Pressure" )), + m_motionModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Motion" )), + m_velocityModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Speed" )), + m_strikeModel( FALSE, this, tr( "Bowed" ) ), m_presetsModel(this), - m_spreadModel(0, 0, 255, 1, this), + m_spreadModel(0, 0, 255, 1, this, tr( "Spread" )), m_filesMissing( FALSE ) { m_hardnessModel.setTrack( _instrument_track ); @@ -338,7 +338,7 @@ malletsInstrumentView::malletsInstrumentView( malletsInstrument * _instrument, connect( &_instrument->m_presetsModel, SIGNAL( dataChanged() ), this, SLOT( changePreset() ) ); - m_spreadKnob = new knob( knobBright_26, this, tr( "Spread" ) ); + m_spreadKnob = new knob( knobBright_26, this ); m_spreadKnob->setLabel( tr( "Spread" ) ); m_spreadKnob->move( 178, 173 ); m_spreadKnob->setHintText( tr( "Spread:" ) + " ", "" ); @@ -370,27 +370,27 @@ QWidget * malletsInstrumentView::setupModalBarControls( QWidget * _parent ) QWidget * widget = new QWidget( _parent ); widget->setFixedSize( 250, 250 ); - m_hardnessKnob = new knob( knobBright_26, widget, tr( "Hardness" ) ); + m_hardnessKnob = new knob( knobBright_26, widget ); m_hardnessKnob->setLabel( tr( "Hardness" ) ); m_hardnessKnob->move( 145, 24 ); m_hardnessKnob->setHintText( tr( "Hardness:" ) + " ", "" ); - m_positionKnob = new knob( knobBright_26, widget, tr( "Position" ) ); + m_positionKnob = new knob( knobBright_26, widget ); m_positionKnob->setLabel( tr( "Position" ) ); m_positionKnob->move( 195, 24 ); m_positionKnob->setHintText( tr( "Position:" ) + " ", "" ); - m_vibratoGainKnob = new knob( knobBright_26, widget, tr( "Vibrato Gain" ) ); + m_vibratoGainKnob = new knob( knobBright_26, widget ); m_vibratoGainKnob->setLabel( tr( "Vib Gain" ) ); m_vibratoGainKnob->move( 56, 86 ); m_vibratoGainKnob->setHintText( tr( "Vib Gain:" ) + " ", "" ); - m_vibratoFreqKnob = new knob( knobBright_26, widget, tr( "Vibrato Freq" ) ); + m_vibratoFreqKnob = new knob( knobBright_26, widget ); m_vibratoFreqKnob->setLabel( tr( "Vib Freq" ) ); m_vibratoFreqKnob->move( 117, 86 ); m_vibratoFreqKnob->setHintText( tr( "Vib Freq:" ) + " ", "" ); - m_stickKnob = new knob( knobBright_26, widget, tr( "Stick Mix" ) ); + m_stickKnob = new knob( knobBright_26, widget ); m_stickKnob->setLabel( tr( "Stick Mix" ) ); m_stickKnob->move( 178, 86 ); m_stickKnob->setHintText( tr( "Stick Mix:" ) + " ", "" ); @@ -406,27 +406,27 @@ QWidget * malletsInstrumentView::setupTubeBellControls( QWidget * _parent ) QWidget * widget = new QWidget( _parent ); widget->setFixedSize( 250, 250 ); - m_modulatorKnob = new knob( knobBright_26, widget, tr( "Modulator" ) ); + 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, tr( "Crossfade" ) ); + 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, tr( "LFO Speed" ) ); + 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, tr( "LFO Depth" ) ); + 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, tr( "ADSR" ) ); + m_adsrKnob = new knob( knobBright_26, widget ); m_adsrKnob->setLabel( tr( "ADSR" ) ); m_adsrKnob->move( 178, 86 ); m_adsrKnob->setHintText( tr( "ADSR:" ) + " ", "" ); @@ -443,20 +443,20 @@ QWidget * malletsInstrumentView::setupBandedWGControls( QWidget * _parent ) QWidget * widget = new QWidget( _parent ); widget->setFixedSize( 250, 250 ); - m_strikeLED = new ledCheckBox( tr( "Bowed" ), widget, tr( "Bowed" ) ); + m_strikeLED = new ledCheckBox( tr( "Bowed" ), widget ); m_strikeLED->move( 165, 30 ); - m_pressureKnob = new knob( knobBright_26, widget, tr( "Pressure" ) ); + m_pressureKnob = new knob( knobBright_26, widget ); m_pressureKnob->setLabel( tr( "Pressure" ) ); m_pressureKnob->move( 56, 86 ); m_pressureKnob->setHintText( tr( "Pressure:" ) + " ", "" ); - m_motionKnob = new knob( knobBright_26, widget, tr( "Motion" ) ); + m_motionKnob = new knob( knobBright_26, widget ); m_motionKnob->setLabel( tr( "Motion" ) ); m_motionKnob->move( 117, 86 ); m_motionKnob->setHintText( tr( "Motion:" ) + " ", "" ); - m_velocityKnob = new knob( knobBright_26, widget, tr( "Speed" ) ); + m_velocityKnob = new knob( knobBright_26, widget ); m_velocityKnob->setLabel( tr( "Speed" ) ); m_velocityKnob->move( 178, 86 ); m_velocityKnob->setHintText( tr( "Speed:" ) + " ", "" ); diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp index 6a2adb936..85abf8ee8 100644 --- a/plugins/triple_oscillator/triple_oscillator.cpp +++ b/plugins/triple_oscillator/triple_oscillator.cpp @@ -66,21 +66,29 @@ plugin::descriptor PLUGIN_EXPORT tripleoscillator_plugin_descriptor = -oscillatorObject::oscillatorObject( model * _parent, track * _track ) : +oscillatorObject::oscillatorObject( model * _parent, track * _track, int _idx ) : model( _parent ), - m_volumeModel( DefaultVolume / NUM_OF_OSCILLATORS, - MinVolume, MaxVolume, 1.0f, this ), - m_panModel( DefaultPanning, PanningLeft, PanningRight, 1.0f, this ), - m_coarseModel( 0, -2 * KeysPerOctave, 2 * KeysPerOctave, - 1.0f, this ), - m_fineLeftModel( 0.0f, -100.0f, 100.0f, 1.0f, this ), - m_fineRightModel( 0.0f, -100.0f, 100.0f, 1.0f, this ), - m_phaseOffsetModel( 0.0f, 0.0f, 360.0f, 1.0f, this ), - m_stereoPhaseDetuningModel( 0.0f, 0.0f, 360.0f, 1.0f, this ), - m_waveShapeModel( oscillator::SineWave, 0, oscillator::NumWaveShapes-1, - this ), + m_volumeModel( DefaultVolume / NUM_OF_OSCILLATORS, MinVolume, + MaxVolume, 1.0f, this, tr( "Osc %1 volume" ).arg( _idx+1 ) ), + m_panModel( DefaultPanning, PanningLeft, PanningRight, 1.0f, this, + tr( "Osc %1 panning" ).arg( _idx+1 ) ), + m_coarseModel( 0, -2 * KeysPerOctave, 2 * KeysPerOctave, 1.0f, this, + tr( "Osc %1 coarse detuning" ).arg( _idx+1 ) ), + m_fineLeftModel( 0.0f, -100.0f, 100.0f, 1.0f, this, + tr( "Osc %1 fine detuning left" ).arg( _idx+1 ) ), + m_fineRightModel( 0.0f, -100.0f, 100.0f, 1.0f, this, + tr( "Osc %1 fine detuning right" ).arg( _idx + 1 ) ), + m_phaseOffsetModel( 0.0f, 0.0f, 360.0f, 1.0f, this, + tr( "Osc %1 phase-offset" ).arg( _idx+1 ) ), + m_stereoPhaseDetuningModel( 0.0f, 0.0f, 360.0f, 1.0f, this, + tr( "Osc %1 stereo phase-detuning" ).arg( _idx+1 ) ), + m_waveShapeModel( oscillator::SineWave, 0, + oscillator::NumWaveShapes-1, this, + tr( "Osc %1 wave shape" ).arg( _idx+1 ) ), m_modulationAlgoModel( oscillator::SignalMix, 0, - oscillator::NumModulationAlgos-1, this ), + oscillator::NumModulationAlgos-1, this, + tr( "Modulation type " ).arg( _idx+1 ) ), + m_sampleBuffer( new sampleBuffer ), m_volumeLeft( 0.0f ), m_volumeRight( 0.0f ), @@ -218,7 +226,7 @@ tripleOscillator::tripleOscillator( instrumentTrack * _instrument_track ) : { for( int i = 0; i < NUM_OF_OSCILLATORS; ++i ) { - m_osc[i] = new oscillatorObject( this, _instrument_track ); + m_osc[i] = new oscillatorObject( this, _instrument_track, i ); } @@ -426,8 +434,8 @@ void tripleOscillator::updateAllDetuning( void ) class tripleOscKnob : public knob { public: - tripleOscKnob( QWidget * _parent, const QString & _name ) : - knob( knobStyled, _parent, _name ) + tripleOscKnob( QWidget * _parent ) : + knob( knobStyled, _parent ) { setFixedSize( 28, 35 ); } @@ -500,8 +508,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "modulating oscillator 2 with " "oscillator 1" ) ); - m_mod1BtnGrp = new automatableButtonGroup( this, - tr( "Modulation type 1" ) ); + m_mod1BtnGrp = new automatableButtonGroup( this ); m_mod1BtnGrp->addButton( pm_osc1_btn ); m_mod1BtnGrp->addButton( am_osc1_btn ); m_mod1BtnGrp->addButton( mix_osc1_btn ); @@ -557,8 +564,8 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "modulating oscillator 3 with " "oscillator 2" ) ); - m_mod2BtnGrp = new automatableButtonGroup( this, - tr( "Modulation type 2" ) ); + m_mod2BtnGrp = new automatableButtonGroup( this ); + m_mod2BtnGrp->addButton( pm_osc2_btn ); m_mod2BtnGrp->addButton( am_osc2_btn ); m_mod2BtnGrp->addButton( mix_osc2_btn ); @@ -571,8 +578,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, int knob_y = osc_y + i * osc_h; // setup volume-knob - volumeKnob * vk = new volumeKnob( knobStyled, this, tr( - "Osc %1 volume" ).arg( i+1 ) ); + volumeKnob * vk = new volumeKnob( knobStyled, this ); vk->setFixedSize( 28, 35 ); vk->move( 6, knob_y ); vk->setHintText( tr( "Osc %1 volume:" ).arg( @@ -585,8 +591,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "here.").arg( i+1 ) ); // setup panning-knob - knob * pk = new tripleOscKnob( this, - tr( "Osc %1 panning" ).arg( i + 1 ) ); + knob * pk = new tripleOscKnob( this ); pk->move( 35, knob_y ); pk->setHintText( tr("Osc %1 panning:").arg( i + 1 ) + " ", "" ); pk->setWhatsThis( @@ -596,8 +601,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "output right.").arg( i+1 ) ); // setup coarse-knob - knob * ck = new tripleOscKnob( this, - tr( "Osc %1 coarse detuning" ).arg( i + 1 ) ); + knob * ck = new tripleOscKnob( this ); ck->move( 82, knob_y ); ck->setHintText( tr( "Osc %1 coarse detuning:" ).arg( i + 1 ) + " ", " " + tr( "semitones" ) ); @@ -610,8 +614,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, // setup knob for left fine-detuning - knob * flk = new tripleOscKnob( this, - tr( "Osc %1 fine detuning left" ).arg( i+1 ) ); + knob * flk = new tripleOscKnob( this ); flk->move( 111, knob_y ); flk->setHintText( tr( "Osc %1 fine detuning left:" ). arg( i + 1 ) + " ", @@ -624,8 +627,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "\"fat\" sounds." ).arg( i + 1 ) ); // setup knob for right fine-detuning - knob * frk = new tripleOscKnob( this, - tr( "Osc %1 fine detuning right" ).arg( i + 1 ) ); + knob * frk = new tripleOscKnob( this ); frk->move( 140, knob_y ); frk->setHintText( tr( "Osc %1 fine detuning right:" ). arg( i + 1 ) + " ", @@ -639,8 +641,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, // setup phase-offset-knob - knob * pok = new tripleOscKnob( this, - tr( "Osc %1 phase-offset" ).arg( i+1 ) ); + knob * pok = new tripleOscKnob( this ); pok->move( 188, knob_y ); pok->setHintText( tr( "Osc %1 phase-offset:" ). arg( i + 1 ) + " ", @@ -656,8 +657,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, ).arg( i+1 ) ); // setup stereo-phase-detuning-knob - knob * spdk = new tripleOscKnob( this, - tr( "Osc %1 stereo phase-detuning" ).arg( i+1 ) ); + knob * spdk = new tripleOscKnob( this ); spdk->move( 217, knob_y ); spdk->setHintText( tr("Osc %1 stereo phase-detuning:" ). arg( i + 1 ) + " ", @@ -755,8 +755,8 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "wave-shape for current oscillator." ) ); automatableButtonGroup * wsbg = - new automatableButtonGroup( this, - tr( "Osc %1 wave shape" ).arg( i + 1 ) ); + new automatableButtonGroup( this ); + wsbg->addButton( sin_wave_btn ); wsbg->addButton( triangle_wave_btn ); wsbg->addButton( saw_wave_btn ); diff --git a/plugins/triple_oscillator/triple_oscillator.h b/plugins/triple_oscillator/triple_oscillator.h index 487995044..f79fc5a9b 100644 --- a/plugins/triple_oscillator/triple_oscillator.h +++ b/plugins/triple_oscillator/triple_oscillator.h @@ -47,7 +47,7 @@ class oscillatorObject : public model { Q_OBJECT public: - oscillatorObject( model * _parent, track * _track ); + oscillatorObject( model * _parent, track * _track, int _idx ); virtual ~oscillatorObject(); diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index 77177fde6..45d1a573f 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -76,37 +76,43 @@ vibed::vibed( instrumentTrack * instrument_track ) : for( Uint8 harm = 0; harm < 9; harm++ ) { knob = new knobModel( DefaultVolume, MinVolume, MaxVolume, - 1.0f, this ); + 1.0f, this, tr( "String %1 volume" ).arg( harm+1 ) ); m_volumeKnobs.append( knob ); - knob = new knobModel( 0.0f, 0.0f, 0.05f, 0.001f, this ); + knob = new knobModel( 0.0f, 0.0f, 0.05f, 0.001f, this, + tr( "String %1 stiffness" ).arg( harm+1 ) ); m_stiffnessKnobs.append( knob ); - knob = new knobModel( 0.0f, 0.0f, 0.05f, 0.001f, this ); - m_stiffnessKnobs.append( knob ); - - knob = new knobModel( 0.0f, 0.0f, 0.05f, 0.005f, this ); + knob = new knobModel( 0.0f, 0.0f, 0.05f, 0.005f, this, + tr( "Pick %1 position" ).arg( harm+1 ) ); m_pickKnobs.append( knob ); - knob = new knobModel( 0.05f, 0.0f, 0.05f, 0.005f, this ); + knob = new knobModel( 0.05f, 0.0f, 0.05f, 0.005f, this, + tr( "Pickup %1 position" ).arg( harm+1 ) ); m_pickupKnobs.append( knob ); - knob = new knobModel( 0.0f, -1.0f, 1.0f, 0.01f, this ); + knob = new knobModel( 0.0f, -1.0f, 1.0f, 0.01f, this, + tr( "Pan %1" ).arg( harm+1 ) ); m_panKnobs.append( knob ); - knob = new knobModel( 0.0f, -0.1f, 0.1f, 0.001f, this ); + knob = new knobModel( 0.0f, -0.1f, 0.1f, 0.001f, this, + tr( "Detune %1" ).arg( harm+1 ) ); m_detuneKnobs.append( knob ); - knob = new knobModel( 0.0f, 0.0f, 0.75f, 0.01f, this ); + knob = new knobModel( 0.0f, 0.0f, 0.75f, 0.01f, this, + tr( "Fuzziness %1 " ).arg( harm+1 ) ); m_randomKnobs.append( knob ); - knob = new knobModel( 1, 1, 16, 1, this ); + knob = new knobModel( 1, 1, 16, 1, this, + tr( "Length %1" ).arg( harm+1 ) ); m_lengthKnobs.append( knob ); - led = new boolModel( FALSE, this ); + led = new boolModel( FALSE, this, + tr( "Impulse %1" ).arg( harm+1 ) ); m_impulses.append( led ); - led = new boolModel( harm==0, this ); + led = new boolModel( harm==0, this, + tr( "Octave %1" ).arg( harm+1 ) ); m_powerButtons.append( led ); harmonic = new nineButtonSelectorModel( 2, 0, 8, this ); @@ -356,14 +362,13 @@ vibedView::vibedView( instrument * _instrument, "artwork" ) ); setPalette( pal ); - m_volumeKnob = new volumeKnob( knobBright_26, this, tr( "Volume" ) ); + m_volumeKnob = new volumeKnob( knobBright_26, this ); m_volumeKnob->move( 103, 142 ); m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "" ); m_volumeKnob->setWhatsThis( tr( "The 'V' knob sets the volume " "of the selected string." ) ); - m_stiffnessKnob = new knob( knobBright_26, this, - tr( "String stiffness" ) ); + m_stiffnessKnob = new knob( knobBright_26, this ); m_stiffnessKnob->move( 129, 142 ); m_stiffnessKnob->setHintText( tr( "String stiffness:" ) + " ", "" ); @@ -373,16 +378,14 @@ vibedView::vibedView( instrument * _instrument, "the setting, the longer the string will ring." ) ); - m_pickKnob = new knob( knobBright_26, this, - tr( "Pick position" ) ); + m_pickKnob = new knob( knobBright_26, this ); m_pickKnob->move( 153, 142 ); m_pickKnob->setHintText( tr( "Pick position:" ) + " ", "" ); m_pickKnob->setWhatsThis( tr( "The 'P' knob sets the position where the selected string will be 'picked'. " "The lower the setting the closer the pick is to the bridge." ) ); - m_pickupKnob = new knob( knobBright_26, this, - tr( "Pickup position" ) ); + m_pickupKnob = new knob( knobBright_26, this ); m_pickupKnob->move( 177, 142 ); m_pickupKnob->setHintText( tr( "Pickup position:" ) + " ", "" ); @@ -391,14 +394,14 @@ vibedView::vibedView( instrument * _instrument, "for the selected string. The lower the setting, the closer the " "pickup is to the bridge." ) ); - m_panKnob = new knob( knobBright_26, this, tr( "Pan" ) ); + m_panKnob = new knob( knobBright_26, this ); m_panKnob->move( 105, 187 ); m_panKnob->setHintText( tr( "Pan:" ) + " ", "" ); m_panKnob->setWhatsThis( tr( "The Pan knob determines the location of the selected string in the stereo " "field." ) ); - m_detuneKnob = new knob( knobBright_26, this, tr( "Detune" ) ); + m_detuneKnob = new knob( knobBright_26, this ); m_detuneKnob->move( 150, 187 ); m_detuneKnob->setHintText( tr( "Detune:" ) + " ", "" ); m_detuneKnob->setWhatsThis( tr( @@ -406,7 +409,7 @@ vibedView::vibedView( instrument * _instrument, "than zero will cause the string to sound flat. Settings greater than zero " "will cause the string to sound sharp." ) ); - m_randomKnob = new knob( knobBright_26, this, tr( "Fuzziness" ) ); + m_randomKnob = new knob( knobBright_26, this ); m_randomKnob->move( 194, 187 ); m_randomKnob->setHintText( tr( "Fuzziness:" ) + " ", "" ); @@ -415,7 +418,7 @@ vibedView::vibedView( instrument * _instrument, "apparent during the attack, though it can also be used to make the string " "sound more 'metallic'.") ); - m_lengthKnob = new knob( knobBright_26, this, tr( "Length" ) ); + m_lengthKnob = new knob( knobBright_26, this ); m_lengthKnob->move( 23, 193 ); m_lengthKnob->setHintText( tr( "Length:" ) + " ", "" ); @@ -424,7 +427,7 @@ vibedView::vibedView( instrument * _instrument, "will both ring longer and sound brighter, however, they will also eat up " "more CPU cycles." ) ); - m_impulse = new ledCheckBox( "", this, tr( "Impulse" ) ); + m_impulse = new ledCheckBox( "", this ); m_impulse->move( 23, 94 ); toolTip::add( m_impulse, tr( "Impulse or initial state" ) );