From 108528b63df447fe64ff443ee988335d02e9a98a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 13 Feb 2016 01:39:41 +0100
Subject: amend d814acb - SystemExec/Export debugging

---
 libs/ardour/export_handler.cc |  2 +-
 libs/pbd/pbd/system_exec.h    |  2 +-
 libs/pbd/system_exec.cc       | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 96e8052bf4..c36a6da0c7 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -355,7 +355,7 @@ ExportHandler::finish_timespan ()
 			subs.insert (std::pair<char, std::string> ('n', session.name ()));
 
 			ARDOUR::SystemExec *se = new ARDOUR::SystemExec(fmt->command(), subs);
-			info << "Post-export command line : {" << se->GetString() << "}" << endmsg;
+			info << "Post-export command line : {" << se->to_s () << "}" << endmsg;
 			se->ReadStdout.connect_same_thread(command_connection, boost::bind(&ExportHandler::command_output, this, _1, _2));
 			int ret = se->start (2);
 			if (ret == 0) {
diff --git a/libs/pbd/pbd/system_exec.h b/libs/pbd/pbd/system_exec.h
index 07f7d139a7..d5b14c8273 100644
--- a/libs/pbd/pbd/system_exec.h
+++ b/libs/pbd/pbd/system_exec.h
@@ -115,7 +115,7 @@ class LIBPBD_API SystemExec
 
 		virtual ~SystemExec ();
 
-		std::string GetString();
+		std::string to_s() const;
 
 		/** fork and execute the given program
 		 *
diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc
index fc66e1f6e4..a19e873da2 100644
--- a/libs/pbd/system_exec.cc
+++ b/libs/pbd/system_exec.cc
@@ -282,18 +282,6 @@ SystemExec::make_argp_escaped(std::string command, const std::map<char, std::str
 	argp[n] = NULL;
 }
 
-string
-SystemExec::GetString ()
-{
-	stringstream out;
-	if (argp) {
-		for (int i = 0; argp[i]; ++i) {
-			out << argp[i];
-		}
-	}
-	return out.str();
-}
-
 SystemExec::~SystemExec ()
 {
 	terminate ();
@@ -323,6 +311,18 @@ interposer_thread (void *arg) {
 	return 0;
 }
 
+string
+SystemExec::to_s () const
+{
+	stringstream out;
+	if (argp) {
+		for (int i = 0; argp[i]; ++i) {
+			out << argp[i] << " ";
+		}
+	}
+	return out.str();
+}
+
 #ifdef PLATFORM_WINDOWS /* Windows Process */
 
 /* HELPER FUNCTIONS */
-- 
cgit v1.2.3