summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/selection.h1
-rw-r--r--libs/ardour/engine_slave.cc4
-rw-r--r--libs/ardour/selection.cc2
-rw-r--r--libs/ardour/slavable_automation_control.cc3
-rw-r--r--libs/ardour/transport_master.cc3
-rw-r--r--libs/ardour/transport_master_manager.cc4
6 files changed, 10 insertions, 7 deletions
diff --git a/libs/ardour/ardour/selection.h b/libs/ardour/ardour/selection.h
index 36f2d48b23..745b4c96f9 100644
--- a/libs/ardour/ardour/selection.h
+++ b/libs/ardour/ardour/selection.h
@@ -27,7 +27,6 @@
#include <boost/shared_ptr.hpp>
#include "pbd/stateful.h"
-#include "pbd/i18n.h"
#include "ardour/presentation_info.h"
#include "ardour/types.h"
diff --git a/libs/ardour/engine_slave.cc b/libs/ardour/engine_slave.cc
index 062b957ff3..12b7d313a2 100644
--- a/libs/ardour/engine_slave.cc
+++ b/libs/ardour/engine_slave.cc
@@ -20,13 +20,13 @@
#include <iostream>
#include <cerrno>
-#include "pbd/i18n.h"
-
#include "ardour/audioengine.h"
#include "ardour/audio_backend.h"
#include "ardour/session.h"
#include "ardour/transport_master.h"
+#include "pbd/i18n.h"
+
using namespace std;
using namespace ARDOUR;
diff --git a/libs/ardour/selection.cc b/libs/ardour/selection.cc
index 10dc50003c..b41b387e69 100644
--- a/libs/ardour/selection.cc
+++ b/libs/ardour/selection.cc
@@ -30,6 +30,8 @@
#include "ardour/session.h"
#include "ardour/stripable.h"
+#include "pbd/i18n.h"
+
using namespace ARDOUR;
using namespace PBD;
diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc
index 7d4d822529..0bfa2b7249 100644
--- a/libs/ardour/slavable_automation_control.cc
+++ b/libs/ardour/slavable_automation_control.cc
@@ -23,7 +23,6 @@
#include "pbd/error.h"
#include "pbd/memento_command.h"
#include "pbd/types_convert.h"
-#include "pbd/i18n.h"
#include "evoral/Curve.hpp"
@@ -32,6 +31,8 @@
#include "ardour/slavable_automation_control.h"
#include "ardour/session.h"
+#include "pbd/i18n.h"
+
using namespace std;
using namespace ARDOUR;
using namespace PBD;
diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
index f3aad266fe..4f7e69eaec 100644
--- a/libs/ardour/transport_master.cc
+++ b/libs/ardour/transport_master.cc
@@ -20,7 +20,6 @@
#include <vector>
#include "pbd/debug.h"
-#include "pbd/i18n.h"
#include "ardour/audioengine.h"
#include "ardour/midi_port.h"
@@ -30,6 +29,8 @@
#include "ardour/types_convert.h"
#include "ardour/utils.h"
+#include "pbd/i18n.h"
+
namespace ARDOUR {
namespace Properties {
PBD::PropertyDescriptor<bool> fr2997;
diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc
index ff567799dc..80d62b3adc 100644
--- a/libs/ardour/transport_master_manager.cc
+++ b/libs/ardour/transport_master_manager.cc
@@ -16,14 +16,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "pbd/i18n.h"
-
#include "ardour/audioengine.h"
#include "ardour/debug.h"
#include "ardour/disk_reader.h"
#include "ardour/session.h"
#include "ardour/transport_master_manager.h"
+#include "pbd/i18n.h"
+
#if __cplusplus > 199711L
#define local_signbit(x) std::signbit (x)
#else