From eec72421f28ad29fe71c6bdb6509ac2042fd7e67 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Sat, 13 Sep 2008 12:41:35 +0300
Subject: [PATCH] Slightly improve A2J status display

---
 src/Patchage.cpp  | 28 ++++++++++++++++++-------
 src/Patchage.hpp  |  2 +-
 src/a2j_proxy.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++----
 src/a2j_proxy.hpp |  4 ++++
 4 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 61903175..49004841 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -564,17 +564,29 @@ Patchage::set_lash_availability(
 }
 
 void
-Patchage::set_a2j_availability(
-	bool a2j_active)
+Patchage::set_a2j_status(
+	unsigned int status)
 {
-	if (!a2j_active)
+	const char * status_text;
+
+	switch (status)
 	{
-		_main_a2j_status_label->set_text("A2J N/A");
-	}
-	else
-	{
-		_main_a2j_status_label->set_text("A2J available");
+	case A2J_STATUS_NO_RESPONSE:
+		status_text = "A2J N/A";
+		break;
+	case A2J_STATUS_BRIDGE_STOPPED:
+		status_text = "A2J bridge stopped";
+		break;
+	case A2J_STATUS_BRIDGE_STARTED:
+		status_text = "A2J bridge started";
+		break;
+	default:
+		error_msg(str(boost::format("Unknown A2J status %u") % status));
+		status_text = "Unknown A2J status";
+		break;
 	}
+
+	_main_a2j_status_label->set_text(status_text);
 }
 
 struct loadable_project_list_column_record : public Gtk::TreeModel::ColumnRecord
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index a951e58d..1151c265 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -62,7 +62,7 @@ public:
 	void store_window_location();
 	
 	void set_lash_availability(bool lash_active);
-	void set_a2j_availability(bool a2j_active);
+	void set_a2j_status(unsigned int status);
 
 	void load_project_ask();
 	void load_project(const std::string& project_name);
diff --git a/src/a2j_proxy.cpp b/src/a2j_proxy.cpp
index 445afb41..44699aec 100644
--- a/src/a2j_proxy.cpp
+++ b/src/a2j_proxy.cpp
@@ -69,6 +69,9 @@ struct a2j_proxy_impl
 	get_jack_client_name(
 		string& jack_client_name_ref);
 
+	bool
+	is_started();
+
 	bool _server_responding;
 	string _jack_client_name;
 };
@@ -93,6 +96,8 @@ a2j_proxy::get_jack_client_name()
 void
 a2j_proxy_impl::init()
 {
+	unsigned int status;
+
 	_server_responding = false;
 
 	patchage_dbus_add_match("type='signal',interface='" DBUS_INTERFACE_DBUS "',member=NameOwnerChanged,arg0='" A2J_SERVICE "'");
@@ -104,7 +109,23 @@ a2j_proxy_impl::init()
 	// this also actiavtes a2j object if it not activated already
 	get_jack_client_name(_jack_client_name);
 
-	g_app->set_a2j_availability(_server_responding);
+	if (is_started())
+	{
+		status = A2J_STATUS_BRIDGE_STARTED;
+	}
+	else
+	{
+		if (!_server_responding)
+		{
+			status = A2J_STATUS_NO_RESPONSE;
+		}
+		else
+		{
+			status = A2J_STATUS_BRIDGE_STOPPED;
+		}
+	}
+
+	g_app->set_a2j_status(status);
 }
 
 DBusHandlerResult
@@ -118,7 +139,7 @@ a2j_proxy_impl::dbus_message_hook(
 	const char * new_owner;
 
 	assert(proxy);
-	a2j_proxy_impl * me = reinterpret_cast<a2j_proxy_impl *>(proxy);
+	//a2j_proxy_impl * me = reinterpret_cast<a2j_proxy_impl *>(proxy);
 
 	//info_msg("dbus_message_hook() called.");
 
@@ -146,12 +167,12 @@ a2j_proxy_impl::dbus_message_hook(
 		if (old_owner[0] == '\0')
 		{
 			info_msg((string)"A2J activated.");
-			g_app->set_a2j_availability(true);
+			g_app->set_a2j_status(A2J_STATUS_BRIDGE_STOPPED);
 		}
 		else if (new_owner[0] == '\0')
 		{
 			info_msg((string)"A2J deactivated.");
-			g_app->set_a2j_availability(false);
+			g_app->set_a2j_status(A2J_STATUS_NO_RESPONSE);
 		}
 
 		return DBUS_HANDLER_RESULT_HANDLED;
@@ -265,3 +286,27 @@ a2j_proxy::map_jack_port(
 
 	return true;
 }
+
+bool
+a2j_proxy_impl::is_started()
+{
+	DBusMessage * reply_ptr;
+	dbus_bool_t started;
+
+	if (!call(true, A2J_IFACE_CONTROL, "is_started", &reply_ptr, DBUS_TYPE_INVALID))
+	{
+		return false;
+	}
+
+	if (!dbus_message_get_args(reply_ptr, &g_dbus_error, DBUS_TYPE_BOOLEAN, &started, DBUS_TYPE_INVALID))
+	{
+		dbus_message_unref(reply_ptr);
+		dbus_error_free(&g_dbus_error);
+		error_msg("decoding reply of is_started failed.");
+		return false;
+	}
+
+	dbus_message_unref(reply_ptr);
+
+	return started;
+}
diff --git a/src/a2j_proxy.hpp b/src/a2j_proxy.hpp
index c45f47b0..7b12abd8 100644
--- a/src/a2j_proxy.hpp
+++ b/src/a2j_proxy.hpp
@@ -21,6 +21,10 @@
 
 struct a2j_proxy_impl;
 
+#define A2J_STATUS_NO_RESPONSE     0
+#define A2J_STATUS_BRIDGE_STOPPED  1
+#define A2J_STATUS_BRIDGE_STARTED  2
+
 class a2j_proxy
 {
 public: