do not crash when loading old history files with MIDI edits; add all notes in region...

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

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 247357d16b354a12826a11613322a1f8f57128f8..4b4f0a939ad5d55da3c66cfa7014b76800bd4ea4 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include "ardour/port.h"
 #include "ardour/audioengine.h"
 #include "pbd/failed_constructor.h"
@@ -238,7 +242,7 @@ Port::reconnect ()
        return 0;
 }
 
-/** @param n Short or long name */
+/** @param n Short port name (no JACK client name) */
 int
 Port::set_name (std::string const & n)
 {
@@ -246,12 +250,10 @@ Port::set_name (std::string const & n)
                return 0;
        }
 
-       string const s = _engine->make_port_name_non_relative (n);
-
-       int const r = jack_port_set_name (_jack_port, s.c_str());
+       int const r = jack_port_set_name (_jack_port, n.c_str());
 
        if (r == 0) {
-               _name = n; // short form, probably
+               _name = n; 
        }
 
        return r;