Re-fix compile failure with --no-nls (#3111).

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

12 files changed, 20 insertions, 11 deletions

diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h
index 311b60b4e6..6a016ae75a 100644
--- a/libs/ardour/ardour/data_type.h
+++ b/libs/ardour/ardour/data_type.h
@@ -23,8 +23,6 @@
 #include <string>
 #include <jack/jack.h>
 
-#include "i18n.h"
-
 namespace ARDOUR {
 
 
@@ -90,13 +88,7 @@ public:
 		}
 	}
 
-	const char* to_i18n_string() const {
-		switch (_symbol) {
-			case AUDIO: return _("audio");
-			case MIDI: return _("MIDI");
-			default: return _("unknown");
-		}
-	}
+	const char* to_i18n_string () const;
 
 	inline operator uint32_t() const { return (uint32_t)_symbol; }
 
diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index b0a89f640d..281e6303fa 100644
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -23,6 +23,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include "pbd/compose.h"
 #include "ardour/buffer.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
diff --git a/libs/ardour/capturing_processor.cc b/libs/ardour/capturing_processor.cc
index 258363be73..cb9ccc1f6d 100644
--- a/libs/ardour/capturing_processor.cc
+++ b/libs/ardour/capturing_processor.cc
@@ -22,6 +22,8 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
+#include "i18n.h"
+
 namespace ARDOUR {
 
 CapturingProcessor::CapturingProcessor (Session & session)
diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index f36716761b..936b0f8a62 100644
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -30,6 +30,8 @@
 
 #include "pbd/error.h"
 
+#include "i18n.h"
+
 using namespace ARDOUR;
 
 PortExportChannel::PortExportChannel ()
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index e1a955d43c..1297b0c3ea 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
+#include "pbd/compose.h"
 #include "midi++/events.h"
 
 #include "ardour/midi_model.h"
@@ -35,6 +36,8 @@
 #include "ardour/session.h"
 #include "ardour/midi_automation_list_binder.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index 33bc13fb87..f8b8ea9a89 100644
--- a/libs/ardour/pannable.cc
+++ b/libs/ardour/pannable.cc
@@ -19,6 +19,7 @@
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
+#include "pbd/compose.h"
 
 #include "ardour/debug.h"
 #include "ardour/automation_control.h"
@@ -28,6 +29,8 @@
 #include "ardour/pan_controllable.h"
 #include "ardour/session.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 26009e1a64..fc6c1acb0a 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -25,7 +25,7 @@
 #include "ardour/session.h"
 #include "ardour/utils.h"
 
-#include "pbd/stacktrace.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 139101d2d9..4d25fd6f87 100644
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -7,6 +7,8 @@
 #include "ardour/panner_manager.h"
 #include "ardour/panner_search_path.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 57c8500454..2ec9a10bda 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -196,7 +196,7 @@ Send::set_state_2X (const XMLNode& node, int /* version */)
 		return -1;
 	}
 
-	XMLProperty const * prop = (*j)->property X_("name");
+	XMLProperty const * prop = (*j)->property (X_("name"));
 	if (!prop) {
 		return -1;
 	}
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 0b4e64e0df..7cbaf066b5 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include "pbd/compose.h"
 #include "midi++/port.h"
 #include "midi++/manager.h"
 #include "evoral/midi_events.h"
diff --git a/libs/ardour/unknown_processor.cc b/libs/ardour/unknown_processor.cc
index 91c9bc9782..f6c713404f 100755
--- a/libs/ardour/unknown_processor.cc
+++ b/libs/ardour/unknown_processor.cc
@@ -19,6 +19,8 @@
 
 #include "ardour/unknown_processor.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index f2729d4594..518b4e3d0b 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -71,6 +71,7 @@ libardour_sources = [
         'control_protocol_search_path.cc',
         'crossfade.cc',
         'cycle_timer.cc',
+        'data_type.cc',
         'default_click.cc',
         'debug.cc',
         'delivery.cc',