LV2: fixed compilation without LV2 support or older versions of LV2
LV2 core was not compiled conditionally into LMMS binary so compilation failed when building without LV2 support. Furthermore added compatibility code for SLV2 <= 0.6.2.
This commit is contained in:
@@ -318,6 +318,8 @@ ENDIF(WANT_SF2)
|
||||
# check for LV2 (this has an implicit dependency on RDF as far as I can tell)
|
||||
IF(WANT_LV2)
|
||||
CHECK_INCLUDE_FILES(lv2.h LMMS_HAVE_LV2CORE)
|
||||
# compatibility for slv2 <= 0.6.2
|
||||
CHECK_INCLUDE_FILES(slv2/scalepoints.h LMMS_HAVE_SLV2_SCALEPOINTS_H)
|
||||
|
||||
CHECK_LIBRARY_EXISTS(slv2 slv2_world_new "" LMMS_HAVE_SLV2)
|
||||
|
||||
@@ -349,6 +351,7 @@ IF(WANT_LV2)
|
||||
FIND_LIBRARY(SLV2_LIBRARY NAMES slv2 PATH /usr/lib /usr/local/lib)
|
||||
FIND_LIBRARY(RDF_LIBRARY NAMES rdf PATH /usr/lib /usr/local/lib)
|
||||
SET(LMMS_SUPPORT_LV2 TRUE)
|
||||
SET(LMMS_HAVE_LV2 TRUE)
|
||||
ENDIF("${STATUS_LV2}" STREQUAL "OK")
|
||||
ENDIF(WANT_LV2)
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include "lv2_manager.h"
|
||||
|
||||
#ifdef LMMS_HAVE_LV2
|
||||
|
||||
class EXPORT lv22LMMS : public lv2Manager
|
||||
{
|
||||
@@ -76,3 +77,5 @@ private:
|
||||
} ;
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
#ifndef _LV2_MANAGER_H
|
||||
#define _LV2_MANAGER_H
|
||||
|
||||
#ifdef LMMS_HAVE_LV2
|
||||
|
||||
#include <slv2/world.h>
|
||||
#include <slv2/plugin.h>
|
||||
#include <slv2/scalepoint.h>
|
||||
@@ -378,3 +380,5 @@ private:
|
||||
extern lv2Manager * static_lv2_manager; // There is only one of these...
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#cmakedefine LMMS_HAVE_FFTW3F
|
||||
#cmakedefine LMMS_HAVE_FLUIDSYNTH
|
||||
#cmakedefine LMMS_HAVE_JACK
|
||||
#cmakedefine LMMS_HAVE_LV2
|
||||
#cmakedefine LMMS_HAVE_OGGVORBIS
|
||||
#cmakedefine LMMS_HAVE_OSS
|
||||
#cmakedefine LMMS_HAVE_PORTAUDIO
|
||||
@@ -42,6 +43,7 @@
|
||||
#cmakedefine LMMS_HAVE_STRING_H
|
||||
#cmakedefine LMMS_HAVE_PROCESS_H
|
||||
#cmakedefine LMMS_HAVE_LOCALE_H
|
||||
#cmakedefine LMMS_HAVE_SLV2_SCALEPOINTS_H
|
||||
|
||||
/* defines for libsamplerate */
|
||||
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "lv2_2_lmms.h"
|
||||
|
||||
|
||||
#ifdef LMMS_HAVE_LV2
|
||||
|
||||
lv22LMMS::lv22LMMS( void )
|
||||
{
|
||||
l_sortable_plugin_t plugins = getSortedPlugins();
|
||||
@@ -125,3 +127,5 @@ QString lv22LMMS::getShortName( const lv2_key_t & _key )
|
||||
return name;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -34,6 +34,13 @@
|
||||
#include "config_mgr.h"
|
||||
#include "lv2_manager.h"
|
||||
|
||||
#ifdef LMMS_HAVE_LV2
|
||||
|
||||
#ifdef LMMS_HAVE_SLV2_SCALEPOINTS_H
|
||||
#include "slv2/scalepoints.h"
|
||||
#endif
|
||||
|
||||
|
||||
lv2Manager * static_lv2_manager=(lv2Manager *)NULL; // There is only one of these...
|
||||
|
||||
|
||||
@@ -631,4 +638,5 @@ QString lv2Manager::getPortName( const lv2_key_t & _plugin,
|
||||
return QString();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user