ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
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::_;
This commit is contained in:
Robin Gareus 2019-09-18 04:09:26 +02:00
parent ad8f21763e
commit 7f3f201833
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/ardour/export_handler.h
View File

@ -37,8 +37,6 @@
#include "ardour/types.h" #include "ardour/types.h"
#include "pbd/signals.h" #include "pbd/signals.h"
#include "pbd/i18n.h"
namespace AudioGrapher { namespace AudioGrapher {
class BroadcastInfo; class BroadcastInfo;
} }
@ -178,12 +176,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
, index_position (0) , index_position (0)
{} {}
~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;
}
}
/* I/O */ /* I/O */
std::string path; std::string path;

9
libs/ardour/export_handler.cc
View File

@ -22,8 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "ardour/export_handler.h"
#include "pbd/gstdio_compat.h" #include "pbd/gstdio_compat.h"
#include <glibmm.h> #include <glibmm.h>
#include <glibmm/convert.h> #include <glibmm/convert.h>
@ -35,6 +33,7 @@
#include "ardour/audio_port.h" #include "ardour/audio_port.h"
#include "ardour/debug.h" #include "ardour/debug.h"
#include "ardour/export_graph_builder.h" #include "ardour/export_graph_builder.h"
#include "ardour/export_handler.h"
#include "ardour/export_timespan.h" #include "ardour/export_timespan.h"
#include "ardour/export_channel_configuration.h" #include "ardour/export_channel_configuration.h"
#include "ardour/export_status.h" #include "ardour/export_status.h"
@ -962,4 +961,10 @@ ExportHandler::cue_escape_cdtext (const std::string& txt)
return out; 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 } // namespace ARDOUR