diff --git a/include/ladspa_base.h b/include/ladspa_base.h index ef8c98706..f6e1aaf9c 100644 --- a/include/ladspa_base.h +++ b/include/ladspa_base.h @@ -46,7 +46,7 @@ typedef enum bufferData { TOGGLED, INTEGER, - FLOAT, + FLOATING, TIME, NONE } buffer_data_t; diff --git a/plugins/ladspa_effect/ladspa_effect.cpp b/plugins/ladspa_effect/ladspa_effect.cpp index a61df3a32..c4639a080 100644 --- a/plugins/ladspa_effect/ladspa_effect.cpp +++ b/plugins/ladspa_effect/ladspa_effect.cpp @@ -374,7 +374,7 @@ void ladspaEffect::pluginInstantiation( void ) } else { - p->data_type = FLOAT; + p->data_type = FLOATING; } // Get the range and default values. diff --git a/src/core/ladspa_control.cpp b/src/core/ladspa_control.cpp index 8d3f82972..bd64d5321 100644 --- a/src/core/ladspa_control.cpp +++ b/src/core/ladspa_control.cpp @@ -67,7 +67,7 @@ ladspaControl::ladspaControl( model * _parent, port_desc_t * _port, this, SLOT( knobChanged() ) ); break; - case FLOAT: + case FLOATING: m_knobModel.setRange( m_port->min, m_port->max, ( m_port->max - m_port->min ) / ( m_port->name.toUpper() == "GAIN" @@ -113,7 +113,7 @@ LADSPA_Data ladspaControl::getValue( void ) m_toggledModel.value() ); break; case INTEGER: - case FLOAT: + case FLOATING: value = static_cast( m_knobModel.value() ); break; @@ -142,7 +142,7 @@ void ladspaControl::setValue( LADSPA_Data _value ) case INTEGER: m_knobModel.setValue( static_cast( _value ) ); break; - case FLOAT: + case FLOATING: m_knobModel.setValue( static_cast( _value ) ); break; case TIME: @@ -172,7 +172,7 @@ void ladspaControl::saveSettings( QDomDocument & _doc, m_toggledModel.saveSettings( _doc, _this, _name ); break; case INTEGER: - case FLOAT: + case FLOATING: m_knobModel.saveSettings( _doc, _this, _name ); break; case TIME: @@ -199,7 +199,7 @@ void ladspaControl::loadSettings( const QDomElement & _this, m_toggledModel.loadSettings( _this, _name ); break; case INTEGER: - case FLOAT: + case FLOATING: m_knobModel.loadSettings( _this, _name ); break; case TIME: @@ -223,7 +223,7 @@ void ladspaControl::linkControls( ladspaControl * _control ) _control->getToggledModel() ); break; case INTEGER: - case FLOAT: + case FLOATING: knobModel::linkModels( &m_knobModel, _control->getKnobModel() ); break; @@ -275,7 +275,7 @@ void ladspaControl::unlinkControls( ladspaControl * _control ) _control->getToggledModel() ); break; case INTEGER: - case FLOAT: + case FLOATING: knobModel::unlinkModels( &m_knobModel, _control->getKnobModel() ); break; diff --git a/src/gui/widgets/ladspa_control_view.cpp b/src/gui/widgets/ladspa_control_view.cpp index 137b254e4..c20940b5e 100644 --- a/src/gui/widgets/ladspa_control_view.cpp +++ b/src/gui/widgets/ladspa_control_view.cpp @@ -79,7 +79,7 @@ ladspaControlView::ladspaControlView( QWidget * _parent, } case INTEGER: - case FLOAT: + case FLOATING: knb = new knob( knobBright_26, this, m_ctl->getPort()->name ); break;