diff options
Diffstat (limited to 'libs/surfaces')
33 files changed, 31 insertions, 63 deletions
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index dd5e84cfd7..74c2802a7a 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -27,7 +27,7 @@ #include "control_protocol/basic_ui.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index f1036c87a7..6a11cadb4a 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -32,7 +32,7 @@ def build(bld): obj.includes = ['.', './control_protocol'] obj.name = 'libardour_cp' obj.target = 'ardourcp' - obj.use = 'libardour' + obj.use = 'libardour libpbd' obj.uselib = 'GLIBMM SIGCPP XML' obj.install_path = bld.env['LIBDIR'] diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 7d8bb46bf1..0f32b09d4b 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -61,7 +61,7 @@ using namespace PBD; using namespace Glib; using namespace std; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" // instantiate template diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index f9179f8b8b..160ba0ec87 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -36,7 +36,7 @@ #include "faderport.h" #include "gui.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace ARDOUR; diff --git a/libs/surfaces/faderport/i18n.h b/libs/surfaces/faderport/i18n.h deleted file mode 100644 index dcbbfcf52e..0000000000 --- a/libs/surfaces/faderport/i18n.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __i18n_h__ -#define __i18n_h__ - -#include "pbd/compose.h" -#include "pbd/convert.h" -#include "gettext.h" - -#include <vector> -#include <string> - -#define _(Text) dgettext (PACKAGE,Text) -#define N_(Text) gettext_noop (Text) -#define X_(Text) Text -#define I18N(Array) PBD::internationalize (PACKAGE, Array) - -#endif // __i18n_h__ diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index f093287f50..5799ab682a 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -67,7 +67,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 07dc06a3bb..a116c4f2a1 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -53,7 +53,7 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -#include "i18n.h" +#include "pbd/i18n.h" #define midi_ui_context() MidiControlUI::instance() /* a UICallback-derived object that specifies the event loop for signal handling */ diff --git a/libs/surfaces/generic_midi/gmcp_gui.cc b/libs/surfaces/generic_midi/gmcp_gui.cc index 8e861b370d..3c2479b622 100644 --- a/libs/surfaces/generic_midi/gmcp_gui.cc +++ b/libs/surfaces/generic_midi/gmcp_gui.cc @@ -41,7 +41,7 @@ #include "generic_midi_control_protocol.h" -#include "i18n.h" +#include "pbd/i18n.h" class GMCPGUI : public Gtk::VBox { diff --git a/libs/surfaces/generic_midi/i18n.h b/libs/surfaces/generic_midi/i18n.h deleted file mode 100644 index dcbbfcf52e..0000000000 --- a/libs/surfaces/generic_midi/i18n.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __i18n_h__ -#define __i18n_h__ - -#include "pbd/compose.h" -#include "pbd/convert.h" -#include "gettext.h" - -#include <vector> -#include <string> - -#define _(Text) dgettext (PACKAGE,Text) -#define N_(Text) gettext_noop (Text) -#define X_(Text) Text -#define I18N(Array) PBD::internationalize (PACKAGE, Array) - -#endif // __i18n_h__ diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index d46937aff5..dfac991cca 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -31,7 +31,7 @@ #include "device_info.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace ARDOUR; diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc index f67aa3cddd..ca3f146803 100644 --- a/libs/surfaces/mackie/device_profile.cc +++ b/libs/surfaces/mackie/device_profile.cc @@ -33,7 +33,7 @@ #include "mackie_control_protocol.h" #include "device_profile.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace ARDOUR; diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index 6283a5469d..06786197e2 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -48,7 +48,7 @@ #include "surface.h" #include "surface_port.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h index 754c4ac5aa..15d266634c 100644 --- a/libs/surfaces/mackie/gui.h +++ b/libs/surfaces/mackie/gui.h @@ -33,7 +33,7 @@ namespace Gtk { #include "button.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ArdourSurface { diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 224590aa54..2ea61cc9f0 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -83,7 +83,7 @@ using namespace Glib; using namespace ArdourSurface; using namespace Mackie; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" // instantiate template diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc index c04eb52614..3fcf2458b8 100644 --- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc +++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc @@ -9,7 +9,7 @@ #include "midi++/types.h" #include "midi++/port.h" #include "midi++/manager.h" -#include "i18n.h" +#include "pbd/i18n.h" #include <unistd.h> #include <fcntl.h> diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index f26c92c869..4733327d2c 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -32,7 +32,7 @@ #include "surface.h" #include "fader.h" -#include "i18n.h" +#include "pbd/i18n.h" /* handlers for all buttons, broken into a separate file to avoid clutter in * mackie_control_protocol.cc diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 494418a090..ec8192f91d 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -57,7 +57,7 @@ #include "jog.h" #include "meter.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef PLATFORM_WINDOWS #define random() rand() diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc index 6f6500ffa3..ddc5a7b037 100644 --- a/libs/surfaces/mackie/surface_port.cc +++ b/libs/surfaces/mackie/surface_port.cc @@ -41,7 +41,7 @@ #include "surface.h" #include "surface_port.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 474fd44fb3..42828626e4 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -56,7 +56,7 @@ #include "osc_controllable.h" #include "osc_route_observer.h" #include "osc_global_observer.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 8eb7dd1e03..005cac2b5f 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -39,7 +39,7 @@ #include "ardour/types.h" #include "control_protocol/control_protocol.h" -#include "i18n.h" +#include "pbd/i18n.h" class OSCControllable; class OSCRouteObserver; diff --git a/libs/surfaces/osc/osc_global_observer.cc b/libs/surfaces/osc/osc_global_observer.cc index fef3a92619..cd7bf0866d 100644 --- a/libs/surfaces/osc/osc_global_observer.cc +++ b/libs/surfaces/osc/osc_global_observer.cc @@ -26,7 +26,7 @@ #include "osc.h" #include "osc_global_observer.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/libs/surfaces/osc/osc_gui.cc b/libs/surfaces/osc/osc_gui.cc index 7879b75f19..9fd2fce070 100644 --- a/libs/surfaces/osc/osc_gui.cc +++ b/libs/surfaces/osc/osc_gui.cc @@ -33,7 +33,7 @@ #include "osc.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ArdourSurface { diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index f56729e0fa..067e84986a 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/libs/surfaces/osc/osc_route_observer.cc @@ -28,7 +28,7 @@ #include "osc.h" #include "osc_route_observer.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 3cbdf8b941..b01c4876b3 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -32,7 +32,7 @@ #include "osc.h" #include "osc_select_observer.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/libs/surfaces/tranzport/button_events.cc b/libs/surfaces/tranzport/button_events.cc index 1b070b3281..ebc00f95be 100644 --- a/libs/surfaces/tranzport/button_events.cc +++ b/libs/surfaces/tranzport/button_events.cc @@ -26,7 +26,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include <pbd/abstract_ui.cc> diff --git a/libs/surfaces/tranzport/general.cc b/libs/surfaces/tranzport/general.cc index 35d2f2bb3b..2b39aaa2d7 100644 --- a/libs/surfaces/tranzport/general.cc +++ b/libs/surfaces/tranzport/general.cc @@ -26,7 +26,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include <pbd/abstract_ui.cc> // HA, I don't need this anymore diff --git a/libs/surfaces/tranzport/init.cc b/libs/surfaces/tranzport/init.cc index 459da81cbc..1e284b5831 100644 --- a/libs/surfaces/tranzport/init.cc +++ b/libs/surfaces/tranzport/init.cc @@ -26,7 +26,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include <pbd/abstract_ui.cc> diff --git a/libs/surfaces/tranzport/io_usb.cc b/libs/surfaces/tranzport/io_usb.cc index 56d270b62a..c9c595ee0d 100644 --- a/libs/surfaces/tranzport/io_usb.cc +++ b/libs/surfaces/tranzport/io_usb.cc @@ -36,7 +36,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include <pbd/abstract_ui.cc> diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc index 544bb3df96..027665ef4a 100644 --- a/libs/surfaces/tranzport/show.cc +++ b/libs/surfaces/tranzport/show.cc @@ -44,7 +44,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" diff --git a/libs/surfaces/tranzport/state.cc b/libs/surfaces/tranzport/state.cc index 59eaef0460..f9988a178e 100644 --- a/libs/surfaces/tranzport/state.cc +++ b/libs/surfaces/tranzport/state.cc @@ -38,7 +38,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" diff --git a/libs/surfaces/tranzport/wheel.cc b/libs/surfaces/tranzport/wheel.cc index d90e0e2b6e..00a66f9943 100644 --- a/libs/surfaces/tranzport/wheel.cc +++ b/libs/surfaces/tranzport/wheel.cc @@ -38,7 +38,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/abstract_ui.cc" diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc index 6880218ff0..1882ad534c 100644 --- a/libs/surfaces/tranzport/wheel_modes.cc +++ b/libs/surfaces/tranzport/wheel_modes.cc @@ -48,7 +48,7 @@ using namespace std; using namespace sigc; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" #include <pbd/abstract_ui.cc> diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc index d86dbbc172..df16bc05a5 100644 --- a/libs/surfaces/wiimote/wiimote.cc +++ b/libs/surfaces/wiimote/wiimote.cc @@ -24,7 +24,7 @@ #include "pbd/error.h" #include "ardour/debug.h" #include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "wiimote.h" |