nick m's fix for markers etc ; several tweaks for mute/solo ; rename run_in_place() as run()

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

1 files changed, 11 insertions, 2 deletions

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index bbf1036dd4..db4b6ca178 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -17,7 +17,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#include <iostream>
+
+#include "pbd/enumwriter.h"
 
 #include "ardour/mute_master.h"
 #include "ardour/rc_configuration.h"
@@ -104,11 +105,19 @@ MuteMaster::get_value () const
 int
 MuteMaster::set_state (const XMLNode& node)
 {
+	const XMLProperty* prop;
+
+	if ((prop = node.property ("mute-point")) != 0) {
+		_mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
+	}
+
 	return 0;
 }
 
 XMLNode&
 MuteMaster::get_state()
 {
-	return *(new XMLNode (X_("MuteMaster")));
+	XMLNode* node = new XMLNode (X_("MuteMaster"));
+	node->add_property ("mute-point", enum_2_string (_mute_point));
+	return *node;
 }