hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Updated some instruments for MV

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@692 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-02-16 02:14:14 +00:00
parent 5d5ad19021
commit d3a46695cf
5 changed files with 176 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2008-02-15 Paul Giblock <drfaygo/at/gmail/dot/net>
* plugins/plucked_string_synth/plucked_string_synth.cpp:
* plugins/plucked_string_synth/plucked_string_synth.h:
* plugins/organic/organic.cpp:
* plugins/organic/organic.h:
Updated some instruments for M/V. Unfortunately one is an old version
and the other is obsoleted
2008-02-16 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/ladspa_effect/ladspa_controls.cpp:

185
plugins/organic/organic.cpp
View File

@@ -81,10 +81,24 @@ organicInstrument::organicInstrument( instrumentTrack * _channel_track ) :
{
m_numOscillators = 8;
m_osc = new oscillatorObject*[ m_numOscillators ];
for (int i=0; i < m_numOscillators; i++)
{
m_osc[i] = new oscillatorObject( this, _channel_track );
m_osc[i]->m_numOscillators = m_numOscillators;
// Connect events
connect( &m_osc[i]->m_oscKnob, SIGNAL( dataChanged() ),
m_osc[i], SLOT ( oscButtonChanged() ) );
connect( &m_osc[i]->m_volKnob, SIGNAL( dataChanged() ),
m_osc[i], SLOT( updateVolume() ) );
connect( &m_osc[i]->m_panKnob, SIGNAL( dataChanged() ),
m_osc[i], SLOT( updateVolume() ) );
connect( &m_osc[i]->m_detuneKnob, SIGNAL( dataChanged() ),
m_osc[i], SLOT( updateDetuning() ) );
m_osc[i]->updateVolume();
}
m_osc[0]->m_harmonic = log2f( 0.5f ); // one octave below
@@ -102,8 +116,9 @@ organicInstrument::organicInstrument( instrumentTrack * _channel_track ) :
}
//connect( engine::getMixer(), SIGNAL( sampleRateChanged() ),
// this, SLOT( updateAllDetuning() ) );
connect( engine::getMixer(), SIGNAL( sampleRateChanged() ),
this, SLOT( updateAllDetuning() ) );
}
@@ -129,7 +144,7 @@ void organicInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this )
m_osc[i]->m_volKnob.saveSettings( _doc, _this, "vol" + is );
m_osc[i]->m_panKnob.saveSettings( _doc, _this, "pan" + is );
_this.setAttribute( "harmonic" + is, QString::number(
powf( 2.0f, m_osc[i]->m_harmonic ) ) );
d powf( 2.0f, m_osc[i]->m_harmonic ) ) );
m_osc[i]->m_detuneKnob.saveSettings( _doc, _this, "detune"
+ is );
m_osc[i]->m_oscKnob.saveSettings( _doc, _this, "wavetype"
@@ -304,20 +319,20 @@ float inline organicInstrument::waveshape(float in, float amount)
void organicInstrument::randomiseSettings( void )
{
/*
for( int i = 0; i < m_numOscillators; i++ )
{
m_osc[i].m_volKnob->setValue( intRand( 0, 100 ) );
m_osc[i]->m_volKnob.setValue( intRand( 0, 100 ) );
m_osc[i].m_detuneKnob->setValue( intRand( -5, 5 ) );
m_osc[i]->m_detuneKnob.setValue( intRand( -5, 5 ) );
m_osc[i].m_panKnob->setValue(
m_osc[i]->m_panKnob.setValue(
//(int)gaussRand(PANNING_LEFT, PANNING_RIGHT,1,0)
0 );
m_osc[i].m_oscKnob->setValue( intRand( 0, 5 ) );
m_osc[i]->m_oscKnob.setValue( intRand( 0, 5 ) );
}
*/
}
@@ -342,17 +357,79 @@ int organicInstrument::intRand( int min, int max )
return( randn );
}
pluginView * organicInstrument::instantiateView( QWidget * _parent )
{
return( new organicInstrumentView( this, _parent ) );
}
organicInstrumentView::organicInstrumentView( instrument * _instrument,
QWidget * _parent ) :
instrumentView( _instrument, _parent )
{
organicInstrument * oi = castModel<organicInstrument>();
setAutoFillBackground( TRUE );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );
setPalette( pal );
for (int i=0; i < m_numOscillators; ++i)
// setup knob for FX1
m_fx1Knob = new knob( knobGreen_17, this, tr( "FX1" ) );
m_fx1Knob->move( 20, 200 );
// setup volume-knob
m_volKnob = new knob( knobGreen_17, this, tr( "Osc %1 volume" ).arg(
1 ) );
m_volKnob->move( 50, 200 );
m_volKnob->setHintText( tr( "Osc %1 volume:" ).arg( 1 ) + " ", "%" );
// randomise
m_randBtn = new pixmapButton( this, tr( "Randomise" ) );
m_randBtn->move( 100, 200 );
m_randBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"randomise_pressed" ) );
m_randBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"randomise" ) );
//m_randBtn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ).
// createHeuristicMask() ) );
connect( m_randBtn, SIGNAL ( clicked() ),
oi, SLOT( randomiseSettings() ) );
if( s_artwork == NULL )
{
s_artwork = new QPixmap( PLUGIN_NAME::getIconPixmap(
"artwork" ) );
}
}
organicInstrumentView::~organicInstrumentView()
{
delete[] m_oscKnobs;
}
void organicInstrumentView::modelChanged( void )
{
organicInstrument * oi = castModel<organicInstrument>();
m_numOscillators = oi->m_numOscillators;
m_fx1Knob->setModel( &oi->m_fx1Knob );
m_volKnob->setModel( &oi->m_volKnob );
// TODO: Delete existing oscKnobs if they exist
m_oscKnobs = new oscillatorKnobs[ m_numOscillators ];
// Create knobs, now that we know how many to make
for( int i = 0; i < m_numOscillators; ++i )
{
// setup waveform-knob
knob * oscKnob = new knob( knobGreen_17, this, tr(
@@ -361,9 +438,6 @@ organicInstrumentView::organicInstrumentView( instrument * _instrument,
oscKnob->setHintText( tr( "Osc %1 waveform:" ).arg(
i + 1 ) + " ", "%" );
//connect( m_osc[i].m_oscKnob, SIGNAL( valueChanged() ),
// &m_osc[i], SLOT ( oscButtonChanged() ) );
// setup volume-knob
volumeKnob * volKnob = new volumeKnob( knobGreen_17, this, tr(
"Osc %1 volume" ).arg( i + 1 ) );
@@ -389,65 +463,7 @@ organicInstrumentView::organicInstrumentView( instrument * _instrument,
m_oscKnobs[i] = oscillatorKnobs( volKnob, oscKnob, panKnob, detuneKnob );
/*connect( m_osc[i].m_volKnob, SIGNAL( valueChanged() ),
&m_osc[i], SLOT( updateVolume() ) );
connect( m_osc[i].m_panKnob, SIGNAL( valueChanged() ),
&m_osc[i], SLOT( updateVolume() ) );
//m_osc[i].updateVolume();
connect( m_osc[i].m_detuneKnob, SIGNAL( valueChanged() ),
&m_osc[i], SLOT( updateDetuning() ) );
//m_osc[i].updateDetuning();*/
}
// setup knob for FX1
m_fx1Knob = new knob( knobGreen_17, this, tr( "FX1" ) );
m_fx1Knob->move( 20, 200 );
// setup volume-knob
m_volKnob = new knob( knobGreen_17, this, tr( "Osc %1 volume" ).arg(
1 ) );
m_volKnob->move( 50, 200 );
m_volKnob->setHintText( tr( "Osc %1 volume:" ).arg( 1 ) + " ", "%" );
// randomise
/*m_randBtn = new pixmapButton( this, tr( "Randomise" ), _channel_track );
m_randBtn->move( 100, 200 );
m_randBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"randomise_pressed" ) );
m_randBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"randomise" ) );
//m_randBtn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ).
// createHeuristicMask() ) );
connect( m_randBtn, SIGNAL ( clicked() ),
this, SLOT( randomiseSettings() ) );
*/
if( s_artwork == NULL )
{
s_artwork = new QPixmap( PLUGIN_NAME::getIconPixmap(
"artwork" ) );
}
}
void organicInstrumentView::modelChanged( void )
{
organicInstrument * oi = castModel<organicInstrument>();
m_numOscillators = oi->m_numOscillators;
m_fx1Knob->setModel( &oi->m_fx1Knob );
m_volKnob->setModel( &oi->m_volKnob );
for( int i = 0; i < m_numOscillators; ++i )
{
// Attach to models
m_oscKnobs[i].m_volKnob->setModel(
&oi->m_osc[i]->m_volKnob );
m_oscKnobs[i].m_oscKnob->setModel(
@@ -456,6 +472,8 @@ void organicInstrumentView::modelChanged( void )
&oi->m_osc[i]->m_panKnob );
m_oscKnobs[i].m_detuneKnob->setModel(
&oi->m_osc[i]->m_detuneKnob );
/*connect( m_oscKnobs[i].m_userWaveButton,
SIGNAL( doubleClicked() ),
t->m_osc[i], SLOT( oscUserDefWaveDblClick() ) );
@@ -467,7 +485,7 @@ void organicInstrumentView::modelChanged( void )
oscillatorObject::oscillatorObject( model * _parent, track * _track ) :
model( _parent ),
m_waveShape( oscillator::SineWave, 0, oscillator::NumWaveShapes-1, 1, this ),
m_oscKnob( 0.0f, 0.0f, 5.0f, 0.25f, this ),
m_oscKnob( 0.0f, 0.0f, 5.0f, 1.0f, this ),
m_volKnob( 100.0f, 0.0f, 100.0f, 1.0f, this ),
m_panKnob( DEFAULT_PANNING, PANNING_LEFT, PANNING_RIGHT, 1.0f, this ),
m_detuneKnob( 0.0f, -100.0f, 100.0f, 1.0f, this )
@@ -486,19 +504,19 @@ oscillatorObject::~oscillatorObject()
void oscillatorObject::oscButtonChanged( void )
{
/*
static oscillator::waveShapes shapes[] =
static oscillator::WaveShapes shapes[] =
{
oscillator::SIN_WAVE,
oscillator::SAW_WAVE,
oscillator::SQUARE_WAVE,
oscillator::TRIANGLE_WAVE,
oscillator::MOOG_SAW_WAVE,
oscillator::EXP_WAVE
oscillator::SineWave,
oscillator::SawWave,
oscillator::SquareWave,
oscillator::TriangleWave,
oscillator::MoogSawWave,
oscillator::ExponentialWave
} ;
m_waveShape = shapes[(int)roundf( m_oscKnob->value() )];
*/
m_waveShape.setValue( shapes[(int)roundf( m_oscKnob.value() )] );
}
@@ -506,6 +524,7 @@ void oscillatorObject::oscButtonChanged( void )
void oscillatorObject::updateVolume( void )
{
printf("Updating VOL\n");
m_volumeLeft = ( 1.0f - m_panKnob.value() / (float)PANNING_RIGHT )
* m_volKnob.value() / m_numOscillators / 100.0f;
m_volumeRight = ( 1.0f + m_panKnob.value() / (float)PANNING_RIGHT )

2
plugins/organic/organic.h
View File

@@ -125,7 +125,6 @@ private:
floatModel m_fx1Knob;
floatModel m_volKnob;
/*pixmapButton * m_randBtn;*/
virtual pluginView * instantiateView( QWidget * _parent );
@@ -171,6 +170,7 @@ private:
knob * m_fx1Knob;
knob * m_volKnob;
pixmapButton * m_randBtn;
int m_numOscillators;

76
plugins/plucked_string_synth/plucked_string_synth.cpp
View File

@@ -59,30 +59,10 @@ plugin::descriptor pluckedstringsynth_plugin_descriptor =
// add distortion
pluckedStringSynth::pluckedStringSynth( instrumentTrack * _instrument_track ) :
instrument( _instrument_track, &pluckedstringsynth_plugin_descriptor )
instrument( _instrument_track, &pluckedstringsynth_plugin_descriptor ),
m_pickModel( 0.0f, 0.0f, 0.5f, 0.005f, this ),
m_pickupModel( 0.05f, 0.0f, 0.5f, 0.005f, this )
{
m_pickKnob = new knob( knobDark_28, this, tr( "Pick position" ),
_instrument_track );
m_pickKnob->setRange( 0.0f, 0.5f, 0.005f );
m_pickKnob->setInitValue( 0.0f );
m_pickKnob->move( 86, 134 );
m_pickKnob->setHintText( tr( "Pick position:" ) + " ", "" );
m_pickupKnob = new knob( knobDark_28, this, tr( "Pickup position" ),
_instrument_track );
m_pickupKnob->setRange( 0.0f, 0.5f, 0.005f );
m_pickupKnob->setInitValue( 0.05f );
m_pickupKnob->move( 138, 134 );
m_pickupKnob->setHintText( tr( "Pickup position:" ) + " ", "" );
#ifdef QT4
setAutoFillBackground( TRUE );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );
setPalette( pal );
#else
setErasePixmap( PLUGIN_NAME::getIconPixmap( "artwork" ) );
#endif
}
@@ -98,8 +78,8 @@ pluckedStringSynth::~pluckedStringSynth()
void pluckedStringSynth::saveSettings( QDomDocument & _doc,
QDomElement & _this )
{
m_pickKnob->saveSettings( _doc, _this, "pick" );
m_pickupKnob->saveSettings( _doc, _this, "pickup" );
m_pickModel.saveSettings( _doc, _this, "pick" );
m_pickupModel.saveSettings( _doc, _this, "pickup" );
}
@@ -107,8 +87,8 @@ void pluckedStringSynth::saveSettings( QDomDocument & _doc,
void pluckedStringSynth::loadSettings( const QDomElement & _this )
{
m_pickKnob->loadSettings( _this, "pick" );
m_pickupKnob->loadSettings( _this, "pickup" );
m_pickModel.loadSettings( _this, "pick" );
m_pickupModel.loadSettings( _this, "pickup" );
}
@@ -127,8 +107,8 @@ void pluckedStringSynth::playNote( notePlayHandle * _n, bool )
if ( _n->totalFramesPlayed() == 0 )
{
_n->m_pluginData = new pluckSynth( _n->frequency(),
m_pickKnob->value(),
m_pickupKnob->value(),
m_pickModel.value(),
m_pickupModel.value(),
engine::getMixer()->sampleRate() );
}
@@ -159,8 +139,44 @@ void pluckedStringSynth::deleteNotePluginData( notePlayHandle * _n )
}
pluginView * pluckedStringSynth::instantiateView( QWidget * _parent )
{
return( new pluckedStringSynthView( this, _parent ) );
}
pluckedStringSynthView::pluckedStringSynthView( instrument * _instrument,
QWidget * _parent ) :
instrumentView( _instrument, _parent )
{
m_pickKnob = new knob( knobDark_28, this, tr( "Pick position" ) );
m_pickKnob->move( 86, 134 );
m_pickKnob->setHintText( tr( "Pick position:" ) + " ", "" );
m_pickupKnob = new knob( knobDark_28, this, tr( "Pickup position" ) );
m_pickupKnob->move( 138, 134 );
m_pickupKnob->setHintText( tr( "Pickup position:" ) + " ", "" );
setAutoFillBackground( TRUE );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );
setPalette( pal );
}
pluckedStringSynthView::~pluckedStringSynthView()
{
}
void pluckedStringSynthView::modelChanged( void )
{
pluckedStringSynth * p = castModel<pluckedStringSynth>();
m_pickKnob->setModel( &p->m_pickModel );
m_pickupKnob->setModel( &p->m_pickupModel );
}
pluckSynth::delayLine * FASTCALL pluckSynth::initDelayLine( int _len )
{
@@ -250,7 +266,7 @@ extern "C"
{
// neccessary for getting instance out of shared lib
plugin * lmms_plugin_main( void * _data )
plugin * lmms_plugin_main( model *, void * _data )
{
return( new pluckedStringSynth(
static_cast<instrumentTrack *>( _data ) ) );

19
plugins/plucked_string_synth/plucked_string_synth.h
View File

@@ -28,6 +28,8 @@
#define _PLUCKED_STRING_SYNTH_H
#include "instrument.h"
#include "instrument_view.h"
#include "knob.h"
class knob;
@@ -208,8 +210,25 @@ public:
virtual QString nodeName( void ) const;
virtual pluginView * instantiateView( QWidget * _parent );
private:
knobModel m_pickModel;
knobModel m_pickupModel;
friend class pluckedStringSynthView;
} ;
class pluckedStringSynthView : public instrumentView
{
public:
pluckedStringSynthView( instrument * _instrument,
QWidget * _parent );
virtual ~pluckedStringSynthView();
private:
virtual void modelChanged( void );
knob * m_pickKnob;
knob * m_pickupKnob;