Remove "i18n.h" include from header - fix builds

i18n alsways needs to be included last. This fixes an ambiguity of "_" boost/function_types/detail/class_transform.hpp:23:26: error: ‘boost::mpl::placeholders::_’ has not been declared using mpl::placeholders::_;
Ardour · Sep 18, 2019 · 7f3f201 · 7f3f201
1 parent ad8f217
commit 7f3f201
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
@@ -37,8 +37,6 @@
 #include "ardour/types.h"
 #include "pbd/signals.h"
 
-#include "pbd/i18n.h"
-
 namespace AudioGrapher {
 	class BroadcastInfo;
 }
@@ -178,12 +176,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
 		  , index_position (0)
 		  {}
 
-		~CDMarkerStatus () {
-			if (!g_file_set_contents (path.c_str(), out.str().c_str(), -1, NULL)) {
-				PBD::error << string_compose(_("Editor: cannot open \"%1\" as export file for CD marker file"), path) << endmsg;
-			}
-
-		}
+		~CDMarkerStatus ();
 
 		/* I/O */
 		std::string         path;

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
@@ -22,8 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ardour/export_handler.h"
-
 #include "pbd/gstdio_compat.h"
 #include <glibmm.h>
 #include <glibmm/convert.h>
@@ -35,6 +33,7 @@
 #include "ardour/audio_port.h"
 #include "ardour/debug.h"
 #include "ardour/export_graph_builder.h"
+#include "ardour/export_handler.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_status.h"
@@ -962,4 +961,10 @@ ExportHandler::cue_escape_cdtext (const std::string& txt)
 	return out;
 }
 
+ExportHandler::CDMarkerStatus::~CDMarkerStatus () {
+	if (!g_file_set_contents (path.c_str(), out.str().c_str(), -1, NULL)) {
+		PBD::error << string_compose(("Editor: cannot open \"%1\" as export file for CD marker file"), path) << endmsg;
+	}
+}
+
 } // namespace ARDOUR