merge with master, primarily for adrian's maximise-mixer change

[ardour.git] / libs / ardour / plugin.cc

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 57198475d72f9ad81d355924e91a19da7acd4ea5..11d859ed8c81fe3558d5effcd200dfb5781b0e1f 100644 (file)
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -27,12 +27,16 @@
 #include <cstdlib>
 #include <cstdio> // so libraptor doesn't complain
 #include <cmath>
+#ifndef COMPILER_MSVC
 #include <dirent.h>
+#endif
 #include <sys/stat.h>
 #include <cerrno>
 #include <utility>
 
+#ifdef HAVE_LRDF
 #include <lrdf.h>
+#endif
 
 #include "pbd/compose.h"
 #include "pbd/error.h"
@@ -68,6 +72,11 @@ using namespace PBD;
 
 namespace ARDOUR { class AudioEngine; }
 
+#ifdef NO_PLUGIN_STATE
+static bool seen_get_state_message = false;
+static bool seen_set_state_message = false;
+#endif
+
 bool
 PluginInfo::is_instrument () const
 {
@@ -299,18 +308,28 @@ Plugin::resolve_midi ()
        _have_pending_stop_events = true;
 }
 
+
 vector<Plugin::PresetRecord>
 Plugin::get_presets ()
 {
+       vector<PresetRecord> p;
+
+#ifndef NO_PLUGIN_STATE
        if (!_have_presets) {
                find_presets ();
                _have_presets = true;
        }
 
-       vector<PresetRecord> p;
        for (map<string, PresetRecord>::const_iterator i = _presets.begin(); i != _presets.end(); ++i) {
                p.push_back (i->second);
        }
+#else
+       if (!seen_set_state_message) {
+               info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a full version"),
+                                       PROGRAM_NAME)
+                    << endmsg;
+       }
+#endif
 
        return p;
 }
@@ -376,7 +395,17 @@ Plugin::get_state ()
        root->add_property (X_("last-preset-label"), _last_preset.label);
        root->add_property (X_("parameter-changed-since-last-preset"), _parameter_changed_since_last_preset ? X_("yes") : X_("no"));
 
+#ifndef NO_PLUGIN_STATE        
        add_state (root);
+#else
+       if (!seen_get_state_message) {
+               info << string_compose (_("Saving plugin settings is not supported in this build of %1. Consider paying for the full version"),
+                                       PROGRAM_NAME)
+                    << endmsg;
+               seen_get_state_message = true;
+       }
+#endif
+
        return *root;
 }