Tmp

include/LadspaBase.h

@@ -45,6 +45,7 @@ typedef enum BufferRates
 typedef enum BufferData
 {
 	TOGGLED,
+	ENUM,
 	INTEGER,
 	FLOATING,
 	TIME,

include/LadspaManager.h

@@ -179,6 +179,12 @@ class EXPORT LadspaManager
 	be described as [-0.1, 3.1]. */
 	bool  isInteger( const ladspa_key_t & _plugin, uint32_t _port );
 
+	/* Indicates that a user interface would probably wish to provide a
+	stepped control taking only integer values. This is equal to isInteger,
+	but the number of values is usually small and may be better depicted
+	with a combo box. */
+	bool  isEnum( const ladspa_key_t & _plugin, uint32_t _port );
+
 	/* Returns the name of the port. */
 	QString  getPortName( const ladspa_key_t & _plugin, uint32_t _port );
 

plugins/LadspaEffect/LadspaControlDialog.cpp

@@ -112,10 +112,10 @@ void LadspaControlDialog::updateEffectView( LadspaControls * _ctl )
 		{
 			if( (*it)->port()->proc == proc )
 			{
+				buffer_data_t this_port = (*it)->port()->data_type;
 				if( last_port != NONE &&
-					(*it)->port()->data_type == TOGGLED &&
-					!( (*it)->port()->data_type == TOGGLED && 
-							last_port == TOGGLED ) )
+					( this_port == TOGGLED || this_port == ENUM ) &&
+					( last_port != TOGGLED && last_port != ENUM ) )
 				{
 					++row;
 					col = 0;

plugins/LadspaEffect/LadspaEffect.cpp

@@ -371,6 +371,10 @@ void LadspaEffect::pluginInstantiation()
 			}
 
 			p->scale = 1.0f;
+			if( manager->isEnum( m_key, port ) )
+			{
+				p->data_type = ENUM;
+			}
 			if( manager->isPortToggled( m_key, port ) )
 			{
 				p->data_type = TOGGLED;

src/core/LadspaControl.cpp

@@ -59,6 +59,7 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 			break;
 
 		case INTEGER:
+		case ENUM:
 			m_knobModel.setRange( static_cast<int>( m_port->max ),
 					  static_cast<int>( m_port->min ),
 					  1 + static_cast<int>( m_port->max -
@@ -117,6 +118,7 @@ LADSPA_Data LadspaControl::value()
 		case TOGGLED:
 			return static_cast<LADSPA_Data>( m_toggledModel.value() );
 		case INTEGER:
+		case ENUM:
 		case FLOATING:
 			return static_cast<LADSPA_Data>( m_knobModel.value() );
 		case TIME:
@@ -136,6 +138,7 @@ ValueBuffer * LadspaControl::valueBuffer()
 	{
 		case TOGGLED:
 		case INTEGER:
+		case ENUM:
 			return NULL;
 		case FLOATING:
 			return m_knobModel.valueBuffer();
@@ -159,6 +162,7 @@ void LadspaControl::setValue( LADSPA_Data _value )
 			m_toggledModel.setValue( static_cast<bool>( _value ) );
 			break;
 		case INTEGER:
+		case ENUM:
 			m_knobModel.setValue( static_cast<int>( _value ) );
 			break;
 		case FLOATING:
@@ -193,6 +197,7 @@ void LadspaControl::saveSettings( QDomDocument& doc,
 			m_toggledModel.saveSettings( doc, e, "data" );
 			break;
 		case INTEGER:
+		case ENUM:
 		case FLOATING:
 			m_knobModel.saveSettings( doc, e, "data" );
 			break;
@@ -236,6 +241,7 @@ void LadspaControl::loadSettings( const QDomElement& parent, const QString& name
 			m_toggledModel.loadSettings( e, dataModelName );
 			break;
 		case INTEGER:
+		case ENUM:
 		case FLOATING:
 			m_knobModel.loadSettings( e, dataModelName );
 			break;
@@ -259,6 +265,7 @@ void LadspaControl::linkControls( LadspaControl * _control )
 			BoolModel::linkModels( &m_toggledModel, _control->toggledModel() );
 			break;
 		case INTEGER:
+		case ENUM:
 		case FLOATING:
 			FloatModel::linkModels( &m_knobModel, _control->knobModel() );
 			break;
@@ -309,6 +316,7 @@ void LadspaControl::unlinkControls( LadspaControl * _control )
 			BoolModel::unlinkModels( &m_toggledModel, _control->toggledModel() );
 			break;
 		case INTEGER:
+		case ENUM:
 		case FLOATING:
 			FloatModel::unlinkModels( &m_knobModel, _control->knobModel() );
 			break;

src/core/LadspaManager.cpp

@@ -749,6 +749,31 @@ bool LadspaManager::isInteger( const ladspa_key_t & _plugin,
 
 
 
+bool LadspaManager::isEnum( const ladspa_key_t & _plugin, uint32_t _port )
+{
+	if( m_ladspaManagerMap.contains( _plugin )
+		   && _port < getPortCount( _plugin ) )
+	{
+		LADSPA_Descriptor_Function descriptorFunction =
+			m_ladspaManagerMap[_plugin]->descriptorFunction;
+		const LADSPA_Descriptor * descriptor =
+				descriptorFunction(
+					m_ladspaManagerMap[_plugin]->index );
+		LADSPA_PortRangeHintDescriptor hintDescriptor =
+			descriptor->PortRangeHints[_port].HintDescriptor;
+		// This is an LMMS extension to ladspa
+		return( LADSPA_IS_HINT_INTEGER( hintDescriptor ) &&
+			LADSPA_IS_HINT_TOGGLED( hintDescriptor ) );
+	}
+	else
+	{
+		return( false );
+	}
+}
+
+
+
+
 QString LadspaManager::getPortName( const ladspa_key_t & _plugin,
 								uint32_t _port )
 {

src/gui/widgets/LadspaControlView.cpp

@@ -77,6 +77,7 @@ LadspaControlView::LadspaControlView( QWidget * _parent,
 		}
 
 		case INTEGER:
+		case ENUM:
 		case FLOATING:
 			knb = new Knob( knobBright_26, this, m_ctl->port()->name );
 			break;