Upgrade Calf plugins to 0.90

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

@@ -1,6 +1,8 @@
 # Note:
 # 	The last version of Calf that was LADSPA-capable is version 0.0.18.2
 
+SET(CMAKE_CXX_STANDARD 11)
+
 # Parse version info from autoconf
 FILE(READ veal/configure.ac VERSION_FILE)
 STRING(REPLACE "[" ";" VERSION_FILE ${VERSION_FILE} )
@@ -12,7 +14,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 +31,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 +48,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