X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.cc;h=524d16e017c002e8191ba0ec0959a74028b54f28;hb=5e7d9d30e28e8022661497244ccd43a1f5a836c6;hp=0d646c8add46e24811c95fec8035b2d42e948632;hpb=5c8e239f95138d2a0fa989da7ccbf77a7716fdf4;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 0d646c8add..524d16e017 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -28,6 +28,8 @@
 #include <cerrno>
 #include <fstream>
 
+#include <stdarg.h>
+
 #ifndef PLATFORM_WINDOWS
 #include <sys/resource.h>
 #endif
@@ -55,6 +57,8 @@
 #include "pbd/file_utils.h"
 #include "pbd/localtime_r.h"
 #include "pbd/pthread_utils.h"
+#include "pbd/replace_all.h"
+#include "pbd/xml++.h"
 
 #include "gtkmm2ext/application.h"
 #include "gtkmm2ext/bindings.h"
@@ -181,6 +185,36 @@ ask_about_configuration_copy (string const & old_dir, string const & new_dir, in
 	return (msg.run() == Gtk::RESPONSE_YES);
 }
 
+static void
+libxml_generic_error_func (void* /* parsing_context*/,
+                   const char* msg,
+                   ...)
+{
+	va_list ap;
+	char buf[2048];
+
+	va_start (ap, msg);
+	vsnprintf (buf, sizeof (buf), msg, ap);
+	error << buf << endmsg;
+	va_end (ap);
+}
+
+static void
+libxml_structured_error_func (void* /* parsing_context*/,
+                              xmlErrorPtr err)
+{
+	string msg = err->message;
+
+	replace_all (msg, "\n", "");
+
+	error << X_("XML error: ") << msg << " in " << err->file << " at line " << err->line;
+	if (err->int2) {
+		error << ':' << err->int2;
+	}
+	error << endmsg;
+}
+
+
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfiguration* uic)
 
 	: Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
@@ -259,6 +293,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
 		theArdourUI = this;
 	}
 
+	/* stop libxml from spewing to stdout/stderr */
+
+	xmlSetGenericErrorFunc (this, libxml_generic_error_func);
+	xmlSetStructuredErrorFunc (this, libxml_structured_error_func);
+	
 	ui_config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
 	boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
 	ui_config->map_parameters (pc);
@@ -3170,6 +3209,9 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
 		msg.set_position (Gtk::WIN_POS_CENTER);
 		pop_back_splash (msg);
 		msg.present ();
+
+		dump_errors (cerr);
+		
 		(void) msg.run ();
 		msg.hide ();