Fixing LV2_SUPPORT #ifdefs

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 040dbefedcf2a4e36e78df8943d04583749b4da4..99c949fdcbbd2c7c54950c5fa34408160e50e600 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -37,7 +37,9 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/record_enable_control.h"
 #include "ardour/session.h"
+#ifdef LV2_SUPPORT
 #include "ardour/uri_map.h"
+#endif
 #include "ardour/value_as_string.h"
 
 #include "pbd/i18n.h"

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 34425324a56dcd698cabe6e1a472c47dfad0a4f3..a28205fdf7b161d7fa12ddb15fb9e3dc15ee4481 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -34,10 +34,10 @@
 #include "ardour/midi_buffer.h"
 #include "ardour/port.h"
 #include "ardour/port_set.h"
-#include "ardour/uri_map.h"
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #include "lv2_evbuf.h"
+#include "ardour/uri_map.h"
 #endif
 #if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
 #include "ardour/vestige/aeffectx.h"

diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc
index ca7b51eb2724d7b28a707c712ca47f1cfc540c68..2b26e169f5b09832757a9fc6603bc54eb218ff45 100644 (file)
--- a/libs/ardour/event_type_map.cc
+++ b/libs/ardour/event_type_map.cc
@@ -24,7 +24,9 @@
 #include "ardour/event_type_map.h"
 #include "ardour/parameter_descriptor.h"
 #include "ardour/parameter_types.h"
+#ifdef LV2_Support
 #include "ardour/uri_map.h"
+#endif
 #include "evoral/Parameter.hpp"
 #include "evoral/ParameterDescriptor.hpp"
 #include "evoral/midi_events.h"

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index fb496b5c748e64a1080d13e6332d8c7ed18f5c45..bd96bfa242e48a66c2ce72ecd72c918912e25006 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -111,8 +111,9 @@
 #include "ardour/runtime_functions.h"
 #include "ardour/session_event.h"
 #include "ardour/source_factory.h"
+#ifdef LV2_SUPPORT
 #include "ardour/uri_map.h"
-
+#endif
 #include "audiographer/routines.h"
 
 #if defined (__APPLE__)

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 0dbd21d04d964900968887d811b8e80cab9000dd..71213264584a94d52345e57ab8bbdc38e6ce3afa 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -92,7 +92,9 @@
 #include "ardour/filename_extensions.h"
 #include "ardour/graph.h"
 #include "ardour/location.h"
+#ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
+#endif
 #include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
 #include "ardour/midi_region.h"
@@ -5225,8 +5227,9 @@ Session::archive_session (const std::string& dest,
        /* write session file */
        _path = to_dir;
        g_mkdir_with_parents (externals_dir ().c_str (), 0755);
-
+#ifdef LV2_SUPPORT
        PBD::Unwinder<bool> uw (LV2Plugin::force_state_save, true);
+#endif
        save_state (name);
        save_default_options ();
 

diff --git a/libs/pbd/pbd/configuration_variable.h b/libs/pbd/pbd/configuration_variable.h
index 143f53f2181b567f1bed58d3bd04827a8a144efc..7af7974229d6d8144c84f74b9999aee96c7ab4dc 100644 (file)
--- a/libs/pbd/pbd/configuration_variable.h
+++ b/libs/pbd/pbd/configuration_variable.h
@@ -90,7 +90,7 @@ class /*LIBPBD_API*/ ConfigVariable : public ConfigVariableBase
 };
 
 /** Specialisation of ConfigVariable to deal with float (-inf etc) */
-template<> LIBPBD_API void
+template<> void
 ConfigVariable<float>::set_from_string (std::string const & s);
 
 /** Specialisation of ConfigVariable for std::string to cope with whitespace properly */