Add a missing #define to our MSVC project (portaudio_backend)

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

diff --git a/libs/ardour/solo_safe_control.cc b/libs/ardour/solo_safe_control.cc
index 040f454ffca5c582f0eda0827f4700ddbb8c3e7c..971b97033dd224659d47445c3a925d78fe6a1d97 100644 (file)
--- a/libs/ardour/solo_safe_control.cc
+++ b/libs/ardour/solo_safe_control.cc
@@ -21,14 +21,14 @@
 #include "ardour/session.h"
 #include "ardour/solo_isolate_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
 
 SoloSafeControl::SoloSafeControl (Session& session, std::string const & name)
-       : SlavableAutomationControl (session, SoloAutomation, ParameterDescriptor (SoloSafeAutomation),
+       : SlavableAutomationControl (session, SoloSafeAutomation, ParameterDescriptor (SoloSafeAutomation),
                                     boost::shared_ptr<AutomationList>(new AutomationList(Evoral::Parameter(SoloSafeAutomation))),
                                     name)
        , _solo_safe (false)
@@ -46,7 +46,6 @@ SoloSafeControl::actually_set_value (double val, PBD::Controllable::GroupControl
        */
 
        AutomationControl::actually_set_value (val, gcd);
-       _session.set_dirty ();
 }
 
 double
@@ -66,8 +65,12 @@ SoloSafeControl::get_value () const
 }
 
 int
-SoloSafeControl::set_state (XMLNode const & node, int)
+SoloSafeControl::set_state (XMLNode const & node, int version)
 {
+       if (SlavableAutomationControl::set_state(node, version)) {
+               return -1;
+       }
+
        XMLProperty const * prop;
 
        if ((prop = node.property ("solo-safe")) != 0) {