Call activate() on plugins when setting state so that they are initialised correctly.

git-svn-id: svn://localhost/ardour2/branches/3.0@7562 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 16 insertions, 10 deletions

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 8322770d31..fa48156787 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -232,11 +232,11 @@ PluginInsert::set_block_size (nframes_t nframes)
 void
 PluginInsert::activate ()
 {
-	Processor::activate ();
-
 	for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
 		(*i)->activate ();
 	}
+	
+	Processor::activate ();
 }
 
 void
diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 49a2faa742..c75a7720e0 100644
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -150,10 +150,13 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
 			}
 
 			if ((prop = (*i)->property ("active")) != 0) {
-				if (_active != string_is_affirmative (prop->value())) {
-					_active = !_active;
-                                        _pending_active = _active;
-					ActiveChanged (); /* EMIT_SIGNAL */
+				bool const a = string_is_affirmative (prop->value ());
+				if (_active != a) {
+					if (a) {
+						activate ();
+					} else {
+						deactivate ();
+					}
 				}
 			}
 		}
@@ -232,10 +235,13 @@ Processor::set_state (const XMLNode& node, int version)
 		}
 	}
 
-	if (_active != string_is_affirmative (prop->value())) {
-		_active = !_active;
-                _pending_active = _active;
- 		ActiveChanged (); /* EMIT_SIGNAL */
+	bool const a = string_is_affirmative (prop->value ());
+	if (_active != a) {
+		if (a) {
+			activate ();
+		} else {
+			deactivate ();
+		}
 	}
 
 	return 0;