diff options
| author | Dobroslav Slavenskoj <dbslav@gmail.com> | 2016-12-08 15:37:07 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-01-05 09:24:40 +0000 |
| commit | 5f0857620e45436f4cb56756c8d7e7f484b0b40a (patch) | |
| tree | eec0dc1d64e2602c5f491fa0be44481e46945467 /libs | |
| parent | 805e40741fa02bc7f5fa3ce5fb8ee1119aa58030 (diff) | |
Fixing LV2_SUPPORT #ifdefs
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/automatable.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/buffer_set.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/event_type_map.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 5 | ||||
| -rw-r--r-- | libs/pbd/pbd/configuration_variable.h | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 040dbefedc..99c949fdcb 100644 --- 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 34425324a5..a28205fdf7 100644 --- 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 ca7b51eb27..2b26e169f5 100644 --- 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 fb496b5c74..bd96bfa242 100644 --- 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 0dbd21d04d..7121326458 100644 --- 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 143f53f218..7af7974229 100644 --- 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 */ |