renamed FLOAT constant to FLOATING for not conflicting with FLOAT type in win32 headers

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1641 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-09-20 12:30:40 +00:00
parent b24ed389ca
commit 529aa59f8f
4 changed files with 10 additions and 10 deletions

View File

@@ -46,7 +46,7 @@ typedef enum bufferData
{
TOGGLED,
INTEGER,
FLOAT,
FLOATING,
TIME,
NONE
} buffer_data_t;

View File

@@ -374,7 +374,7 @@ void ladspaEffect::pluginInstantiation( void )
}
else
{
p->data_type = FLOAT;
p->data_type = FLOATING;
}
// Get the range and default values.

View File

@@ -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<LADSPA_Data>(
m_knobModel.value() );
break;
@@ -142,7 +142,7 @@ void ladspaControl::setValue( LADSPA_Data _value )
case INTEGER:
m_knobModel.setValue( static_cast<int>( _value ) );
break;
case FLOAT:
case FLOATING:
m_knobModel.setValue( static_cast<float>( _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;

View File

@@ -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;