From: Robin Gareus <robin@gareus.org>
Date: Fri, 5 May 2017 12:31:19 +0000 (+0200)
Subject: Fix converting v4 monitor state -- amend 8a6d30377
X-Git-Tag: 5.9~95
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=337b100b47f432c2057cd4d6b952587f5edce859;p=ardour.git

Fix converting v4 monitor state -- amend 8a6d30377

It looks like MonitorControl::_monitoring is unused and should be removed.
The actual value is Evoral::Control::_user_value
---

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 6304235a65..1d17d9238c 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -165,10 +165,11 @@ Track::set_state (const XMLNode& node, int version)
 	}
 
 	/* convert old 3001 state */
-	std::string monitoring;
+	MonitorChoice monitoring;
 	if (node.get_property (X_("monitoring"), monitoring)) {
 		XMLNode mon_node ("backwardscompat");
 		mon_node.set_property (X_("monitoring"), monitoring);
+		mon_node.set_property (X_("value"), (int) monitoring);
 		_monitoring_control->set_state (mon_node, version);
 	}