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

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

gtk2_ardour/ambiguous_file_dialog.cc

@@ -18,7 +18,9 @@
 */
 
 #include <gtkmm/label.h>
+#include "pbd/compose.h"
 #include "ambiguous_file_dialog.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/ardour_ui_mixer.cc

@@ -25,6 +25,7 @@
 
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/edit_note_dialog.cc

@@ -23,6 +23,7 @@
 #include "edit_note_dialog.h"
 #include "canvas-note-event.h"
 #include "midi_region_view.h"
+#include "i18n.h"
 
 using namespace Gtk;
 

gtk2_ardour/editor_group_tabs.cc

@@ -24,6 +24,7 @@
 #include "utils.h"
 #include "editor_route_groups.h"
 #include "editor_routes.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/missing_file_dialog.cc

@@ -23,6 +23,7 @@
 #include "ardour/session.h"
 
 #include "missing_file_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 using namespace std;

gtk2_ardour/missing_plugin_dialog.cc

@@ -19,6 +19,7 @@
 #include <gtkmm/label.h>
 #include "ardour/session.h"
 #include "missing_plugin_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 using namespace std;

gtk2_ardour/new_plugin_preset_dialog.cc

@@ -20,6 +20,7 @@
 
 #include <gtkmm/stock.h>
 #include "new_plugin_preset_dialog.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/normalize_dialog.cc

@@ -23,6 +23,7 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/progressbar.h>
 #include "normalize_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 

gtk2_ardour/patch_change_dialog.cc

@@ -22,6 +22,7 @@
 #include <gtkmm/table.h>
 #include "ardour/beats_frames_converter.h"
 #include "patch_change_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 

gtk2_ardour/plugin_eq_gui.cc

@@ -35,6 +35,8 @@
 #include <iostream>
 #include <cmath>
 
+#include "i18n.h"
+
 using namespace ARDOUR;
 
 PluginEqGui::PluginEqGui(boost::shared_ptr<ARDOUR::PluginInsert> pluginInsert)

gtk2_ardour/region_layering_order_editor.cc

@@ -4,11 +4,11 @@
 #include "ardour/region.h"
 
 #include "gui_thread.h"
-#include "i18n.h"
 #include "keyboard.h"
 #include "public_editor.h"
 #include "region_layering_order_editor.h"
 #include "utils.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/search_path_option.cc

@@ -17,7 +17,9 @@
 */
 
 #include "pbd/strsplit.h"
+#include "pbd/compose.h"
 #include "search_path_option.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/shuttle_control.cc

@@ -31,6 +31,8 @@
 #include "ardour_ui.h"
 #include "shuttle_control.h"
 
+#include "i18n.h"
+
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;

gtk2_ardour/transpose_dialog.cc

@@ -22,6 +22,7 @@
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
 #include "transpose_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 

gtk2_ardour/window_proxy.cc

@@ -19,6 +19,7 @@
 
 #include <gtkmm/window.h>
 #include "window_proxy.h"
+#include "i18n.h"
 
 using namespace std;
 

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; }
 

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"

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)

libs/ardour/export_channel.cc

@@ -30,6 +30,8 @@
 
 #include "pbd/error.h"
 
+#include "i18n.h"
+
 using namespace ARDOUR;
 
 PortExportChannel::PortExportChannel ()

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;

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;

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;

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;

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;
 	}

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"

libs/ardour/unknown_processor.cc

@@ -19,6 +19,8 @@
 
 #include "ardour/unknown_processor.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 

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',

libs/panners/vbap/vbap.cc

@@ -7,6 +7,7 @@
 #include <string>
 
 #include "pbd/cartesian.h"
+#include "pbd/compose.h"
 
 #include "ardour/amp.h"
 #include "ardour/audio_buffer.h"
@@ -18,6 +19,8 @@
 #include "vbap.h"
 #include "vbap_speakers.h"
 
+#include "i18n.h"
+
 using namespace PBD;
 using namespace ARDOUR;
 using namespace std;

libs/surfaces/osc/osc_route_observer.cc

@@ -26,6 +26,8 @@
 #include "osc.h"
 #include "osc_route_observer.h"
 
+#include "i18n.h"
+
 #define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
 
 using namespace std;