make Session::get_remote_nth_stripable() ignore hidden stripables unless asked.

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

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index e108676fa7b5f6096b0a7667952b20d0031f5c50..10d2565c90c4be3ce7f96e965e42856cf59ac8f7 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -40,7 +40,7 @@
 #include "ardour/uri_map.h"
 #include "ardour/value_as_string.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -233,7 +233,12 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
                        if (param.type() == NullAutomation) {
                                warning << "Automation has null type" << endl;
                                continue;
-                        }
+                       }
+
+                       if (_can_automate_list.find (param) == _can_automate_list.end ()) {
+                               warning << "Ignored automation data for non-automatable parameter" << endl;
+                               continue;
+                       }
 
                        if (!id_prop) {
                                warning << "AutomationList node without automation-id property, "