Report subject with errors to client for more meaningful error messages.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4556 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 10 insertions, 4 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index a815c6e7..1d6381fb 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -203,10 +203,14 @@ App::serialiser()
 }
 
 void
-App::response(int32_t id, Status status)
+App::response(int32_t id, Status status, const std::string& subject)
 {
 	if (status) {
-		error_message(ingen_status_string(status));
+		std::string msg = ingen_status_string(status);
+		if (!subject.empty()) {
+			msg += ": " + subject;
+		}
+		error_message(msg);
 	}
 }
 
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 7969982c..1f611a13 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -140,7 +140,7 @@ protected:
 	explicit App(Ingen::Shared::World* world);
 
 	bool animate();
-	void response(int32_t id, Ingen::Status status);
+	void response(int32_t id, Ingen::Status status, const std::string& subject);
 
 	void property_change(const Raul::URI&  subject,
 	                     const Raul::URI&  key,
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 00ba5fd3..ca27787e 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -51,7 +51,9 @@ public:
 
 	void set_connected_to(SharedPtr<Ingen::Interface> engine);
 	void start(App& app, Ingen::Shared::World* world);
-	void ingen_response(int32_t id, Status status) { _attached = true; }
+	void ingen_response(int32_t id, Status status, const std::string& subject) {
+		_attached = true;
+	}
 
 	bool attached()  const { return _finished_connecting; }
 	bool quit_flag() const { return _quit_flag; }