use C++ for PortManager::make_port_name_relative()

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

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 9b2170c349e49bd362c461fa6200337e5261ecfd..89f6d24137f862f9f4ddc13cfd0e7f375c409806 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"
@@ -260,7 +264,7 @@ Plugin::connect_and_run (BufferSet& bufs,
 
                /* Track notes that we are sending to the plugin */
 
-               MidiBuffer& b = bufs.get_midi (0);
+               const MidiBuffer& b = bufs.get_midi (0);
 
                _tracker.track (b.begin(), b.end());
 
@@ -324,6 +328,7 @@ Plugin::get_presets ()
                info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a full version"),
                                        PROGRAM_NAME)
                     << endmsg;
+               seen_set_state_message = true;
        }
 #endif
 
@@ -385,13 +390,13 @@ XMLNode &
 Plugin::get_state ()
 {
        XMLNode* root = new XMLNode (state_node_name ());
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg (X_("C"));
 
        root->add_property (X_("last-preset-uri"), _last_preset.uri);
        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        
+#ifndef NO_PLUGIN_STATE
        add_state (root);
 #else
        if (!seen_get_state_message) {