X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fengine_state_controller.cc;h=06a4f465b2aaf6407c73aeb7147f2272ffae819d;hp=57b8a848884501e50ec0616cf2f78d726cc19c8b;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e

diff --git a/libs/ardour/engine_state_controller.cc b/libs/ardour/engine_state_controller.cc
index 57b8a84888..06a4f465b2 100644
--- a/libs/ardour/engine_state_controller.cc
+++ b/libs/ardour/engine_state_controller.cc
@@ -26,7 +26,7 @@
 
 #include "pbd/pthread_utils.h"
 #include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 
 using namespace ARDOUR;
@@ -150,7 +150,7 @@ EngineStateController::_deserialize_and_load_engine_states ()
 
 		XMLNode* state_node = *state_node_iter;
 		StatePtr engine_state (new State);
-		XMLProperty* prop = NULL;
+		XMLProperty const * prop = NULL;
 
 		if ((prop = state_node->property ("backend-name")) == 0) {
 			continue;
@@ -302,7 +302,7 @@ EngineStateController::_deserialize_and_load_midi_port_states ()
 			for (; input_state_node_iter != input_state_nodes.end (); ++input_state_node_iter) {
 
 				XMLNode* input_state_node = *input_state_node_iter;
-				XMLProperty* prop = NULL;
+				XMLProperty const * prop = NULL;
 
 				if (input_state_node->name () != "input") {
 					continue;
@@ -341,7 +341,7 @@ EngineStateController::_deserialize_and_load_midi_port_states ()
 			for (; output_state_node_iter != output_state_nodes.end (); ++output_state_node_iter) {
 
 				XMLNode* output_state_node = *output_state_node_iter;
-				XMLProperty* prop = NULL;
+				XMLProperty const * prop = NULL;
 
 				if (output_state_node->name () != "output") {
 					continue;