Upgrade Calf plugins to 0.90

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "plugins/OpulenZ/adplug"]
 	path = plugins/OpulenZ/adplug
 	url = https://github.com/adplug/adplug.git
-[submodule "plugins/LadspaEffect/calf/veal"]
-	path = plugins/LadspaEffect/calf/veal
-	url = https://github.com/lmms/veal
 [submodule "plugins/Xpressive/exprtk"]
 	path = plugins/Xpressive/exprtk
 	url = https://github.com/ArashPartow/exprtk
@@ -25,3 +22,6 @@
 [submodule "src/3rdparty/weakjack/weakjack"]
 	path = src/3rdparty/weakjack/weakjack
 	url = https://github.com/x42/weakjack.git
+[submodule "plugins/LadspaEffect/calf/veal"]
+	path = plugins/LadspaEffect/calf/veal
+	url = https://github.com/tresf/veal

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,7 +371,11 @@ void LadspaEffect::pluginInstantiation()
 			}
 
 			p->scale = 1.0f;
-			if( manager->isPortToggled( m_key, port ) )
+			if( manager->isEnum( m_key, port ) )
+			{
+				p->data_type = ENUM;
+			}
+			else if( manager->isPortToggled( m_key, port ) )
 			{
 				p->data_type = TOGGLED;
 			}

plugins/LadspaEffect/calf/CMakeLists.txt

@@ -12,7 +12,7 @@ FILE(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/veal/src/*.cpp")
 LIST(SORT SOURCES)
 
 # Skip files matching pattern
-SET(FILE_PATTERNS "ctl;gui;gtk;session;connector;jack;rdf;draw;fluid;preset;lv2;benchmark;win")
+SET(FILE_PATTERNS "ctl;gui;gtk;session;connector;jack;rdf;draw;fluid;preset;lv2;benchmark;win;plugin.cpp")
 FOREACH(_item ${SOURCES})
 	FOREACH(_pattern ${FILE_PATTERNS})
 		IF(${_item} MATCHES ${_pattern})
@@ -29,6 +29,10 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include"
 
 INSTALL(TARGETS veal LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
 SET_TARGET_PROPERTIES(veal PROPERTIES PREFIX "")
+
+# Disable OSC messaging, it's not mingw compatible
+TARGET_COMPILE_DEFINITIONS(veal PRIVATE DISABLE_OSC=1)
+
 SET(INLINE_FLAGS "")
 IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	SET(INLINE_FLAGS "-finline-functions-called-once -finline-limit=80")
@@ -42,4 +46,3 @@ ENDIF()
 IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
 	SET_TARGET_PROPERTIES(veal PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
 ENDIF()
-

plugins/LadspaEffect/calf/config.h.in

@@ -1,3 +1,7 @@
 #define VERSION "${VERSION}"
 #define PACKAGE_NAME "veal"
 #define USE_LADSPA 1
+#define PKGLIBDIR ""
+
+// Namespace change to avoid conflict with LV2
+#define calf_plugins veal_plugins

src/core/DataFile.cpp

@@ -1016,6 +1016,31 @@ void DataFile::upgrade_1_3_0()
 					{
 						attribute.setAttribute( "value", "veal" );
 					}
+					else if( attribute.attribute( "name" ) == "plugin" &&
+							attribute.attribute( "value" ) == "Sidechaincompressor" )
+					{
+						attribute.setAttribute( "value", "SidechainCompressor" );
+					}
+					else if( attribute.attribute( "name" ) == "plugin" &&
+							attribute.attribute( "value" ) == "Sidechaingate" )
+					{
+						attribute.setAttribute( "value", "SidechainGate" );
+					}
+					else if( attribute.attribute( "name" ) == "plugin" &&
+							attribute.attribute( "value" ) == "Multibandcompressor" )
+					{
+						attribute.setAttribute( "value", "MultibandCompressor" );
+					}
+					else if( attribute.attribute( "name" ) == "plugin" &&
+							attribute.attribute( "value" ) == "Multibandgate" )
+					{
+						attribute.setAttribute( "value", "MultibandGate" );
+					}
+					else if( attribute.attribute( "name" ) == "plugin" &&
+							attribute.attribute( "value" ) == "Multibandlimiter" )
+					{
+						attribute.setAttribute( "value", "MultibandLimiter" );
+					}
 				}
 			}
 		}

src/core/LadspaControl.cpp

@@ -48,6 +48,8 @@ LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port,
 	switch( m_port->data_type )
 	{
 		case TOGGLED:
+			m_toggledModel.setInitValue(
+				static_cast<bool>( m_port->def ) );
 			connect( &m_toggledModel, SIGNAL( dataChanged() ),
 					 this, SLOT( ledChanged() ) );
 			if( m_port->def == 1.0f )
@@ -59,6 +61,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 +120,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 +140,7 @@ ValueBuffer * LadspaControl::valueBuffer()
 	{
 		case TOGGLED:
 		case INTEGER:
+		case ENUM:
 			return NULL;
 		case FLOATING:
 			return m_knobModel.valueBuffer();
@@ -159,6 +164,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 +199,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;
@@ -216,35 +223,64 @@ void LadspaControl::loadSettings( const QDomElement& parent, const QString& name
 	QString linkModelName = "link";
 	QDomElement e = parent.namedItem( name ).toElement();
 
-	// COMPAT < 1.0.0: detect old data format where there's either no dedicated sub
-	// element or there's a direct sub element with automation link information
-	if( e.isNull() || e.hasAttribute( "id" ) )
+	if(e.isNull())
 	{
-		dataModelName = name;
-		linkModelName = name + "link";
-		e = parent;
+		// the port exists in the current effect, but not in the
+		// savefile => it's a new port, so load the default value
+		if( m_link )
+			m_linkEnabledModel.setValue(m_linkEnabledModel.initValue());
+		switch( m_port->data_type )
+		{
+			case TOGGLED:
+				m_toggledModel.setValue(m_toggledModel.initValue());
+				break;
+			case INTEGER:
+			case ENUM:
+			case FLOATING:
+				m_knobModel.setValue(m_knobModel.initValue());
+				break;
+			case TIME:
+				m_tempoSyncKnobModel.setValue(m_tempoSyncKnobModel.initValue());
+				break;
+			default:
+				printf("LadspaControl::loadSettings BAD BAD BAD\n");
+				break;
+		}
 	}
-
-	if( m_link )
+	else
 	{
-		m_linkEnabledModel.loadSettings( e, linkModelName );
-	}
 
-	switch( m_port->data_type )
-	{
-		case TOGGLED:
-			m_toggledModel.loadSettings( e, dataModelName );
-			break;
-		case INTEGER:
-		case FLOATING:
-			m_knobModel.loadSettings( e, dataModelName );
-			break;
-		case TIME:
-			m_tempoSyncKnobModel.loadSettings( e, dataModelName );
-			break;
-		default:
-			printf("LadspaControl::loadSettings BAD BAD BAD\n");
-			break;
+		// COMPAT < 1.0.0: detect old data format where there's either no dedicated sub
+		// element or there's a direct sub element with automation link information
+		if( e.isNull() || e.hasAttribute( "id" ) )
+		{
+			dataModelName = name;
+			linkModelName = name + "link";
+			e = parent;
+		}
+
+		if( m_link )
+		{
+			m_linkEnabledModel.loadSettings( e, linkModelName );
+		}
+
+		switch( m_port->data_type )
+		{
+			case TOGGLED:
+				m_toggledModel.loadSettings( e, dataModelName );
+				break;
+			case INTEGER:
+			case ENUM:
+			case FLOATING:
+				m_knobModel.loadSettings( e, dataModelName );
+				break;
+			case TIME:
+				m_tempoSyncKnobModel.loadSettings( e, dataModelName );
+				break;
+			default:
+				printf("LadspaControl::loadSettings BAD BAD BAD\n");
+				break;
+		}
 	}
 }
 
@@ -259,6 +295,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 +346,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;