diff options
29 files changed, 44 insertions, 12 deletions
diff --git a/gtk2_ardour/ambiguous_file_dialog.cc b/gtk2_ardour/ambiguous_file_dialog.cc index e14d33540e..fe17cde5b1 100644 --- a/gtk2_ardour/ambiguous_file_dialog.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc index 3a1ae4e725..c969afa33f 100644 --- a/gtk2_ardour/ardour_ui_mixer.cc +++ b/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; diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index c4cfe11218..19e072cf4d 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/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; diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc index ccf95b797f..8839748110 100644 --- a/gtk2_ardour/editor_group_tabs.cc +++ b/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; diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc index 56139be32f..c73fc51512 100644 --- a/gtk2_ardour/missing_file_dialog.cc +++ b/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; diff --git a/gtk2_ardour/missing_plugin_dialog.cc b/gtk2_ardour/missing_plugin_dialog.cc index be413c41bc..971343cd9d 100755 --- a/gtk2_ardour/missing_plugin_dialog.cc +++ b/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; diff --git a/gtk2_ardour/new_plugin_preset_dialog.cc b/gtk2_ardour/new_plugin_preset_dialog.cc index 7002d5d240..e21ad9d18b 100644 --- a/gtk2_ardour/new_plugin_preset_dialog.cc +++ b/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; diff --git a/gtk2_ardour/normalize_dialog.cc b/gtk2_ardour/normalize_dialog.cc index 28742931e9..a12732e99a 100644 --- a/gtk2_ardour/normalize_dialog.cc +++ b/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; diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index e4efdc2532..d2c23e7365 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/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; diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index 43ee64c23f..013edd6197 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/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) diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc index 1abccade8a..6640d6d14a 100644 --- a/gtk2_ardour/region_layering_order_editor.cc +++ b/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; diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc index 84b02bf577..6716607383 100644 --- a/gtk2_ardour/search_path_option.cc +++ b/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; diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc index c941336de5..1274dce6f8 100644 --- a/gtk2_ardour/shuttle_control.cc +++ b/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; diff --git a/gtk2_ardour/transpose_dialog.cc b/gtk2_ardour/transpose_dialog.cc index 6a3c5bf119..0913102469 100644 --- a/gtk2_ardour/transpose_dialog.cc +++ b/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; diff --git a/gtk2_ardour/window_proxy.cc b/gtk2_ardour/window_proxy.cc index c37fd0e043..5731d3509d 100755 --- a/gtk2_ardour/window_proxy.cc +++ b/gtk2_ardour/window_proxy.cc @@ -19,6 +19,7 @@ #include <gtkmm/window.h> #include "window_proxy.h" +#include "i18n.h" using namespace std; 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', diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index df1f5d0876..2f047b2342 100644 --- a/libs/panners/vbap/vbap.cc +++ b/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; diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index 91a47fde76..bfef2fb67f 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/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; |