diff --git a/ChangeLog b/ChangeLog index a45aa1dbc..0169bbc7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 2006-08-10 Danny McRae + * src/widgets/ladspa_control.cpp: + unfixed my misunderstood fix of the setting of sample rate + dependent ports + * src/core/mixer: got rid of the "more_effect |= ..." nonsense diff --git a/src/widgets/ladspa_control.cpp b/src/widgets/ladspa_control.cpp index 5f4c2f1ae..507bae24c 100644 --- a/src/widgets/ladspa_control.cpp +++ b/src/widgets/ladspa_control.cpp @@ -54,6 +54,7 @@ ladspaControl::ladspaControl( QWidget * _parent, port_desc_t * _port, engine * _ { case TOGGLED: m_toggle = new ledCheckBox( m_port->name, this, "", eng(), m_track ); +// connect( m_toggle, SIGNAL( toggled( bool ) ), this SLOT( ledChange( bool ) ) ); setFixedSize( m_toggle->width(), m_toggle->height() ); if( m_port->def == 1.0f ) { @@ -62,6 +63,7 @@ ladspaControl::ladspaControl( QWidget * _parent, port_desc_t * _port, engine * _ break; case INTEGER: m_knob = new knob( knobBright_26, this, m_port->name, eng(), m_track); +// connect( m_knob, SIGNAL( valueChanged( float ) ), this SLOT( knobChange( float ) ) ); m_knob->setLabel( m_port->name ); m_knob->setRange( static_cast( m_port->max ), static_cast( m_port->min ), 1 + static_cast( m_port->max - m_port->min ) / 200 ); m_knob->setInitValue( static_cast( m_port->def ) ); @@ -76,6 +78,7 @@ ladspaControl::ladspaControl( QWidget * _parent, port_desc_t * _port, engine * _ break; case FLOAT: m_knob = new knob( knobBright_26, this, m_port->name, eng(), m_track); +// connect( m_knob, SIGNAL( valueChanged( float ) ), this SLOT( knobChange( float ) ) ); m_knob->setLabel( m_port->name ); m_knob->setRange( m_port->min, m_port->max, ( m_port->max - m_port->min ) / 200.0f ); m_knob->setInitValue( m_port->def ); @@ -123,11 +126,6 @@ LADSPA_Data ladspaControl::getValue( void ) break; } - if( m_port->is_scaled ) - { - value /= eng()->getMixer()->sampleRate(); - } - return( value ); } @@ -193,6 +191,22 @@ void FASTCALL ladspaControl::loadSettings( const QDomElement & _this, const QStr } + + +// void ladspaControl::ledChange( bool _state ) +// { +// printf("state %d\n", _state); +// } +// +// +// +// +// void ladspaControl::knobChange( float _value ) +// { +// printf("value %f\n", _value); +// } + + #include "ladspa_control.moc" #endif