From ec3d41bc58ed32ab7678d0b5f04e956d1cf97afc Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 3 Oct 2013 16:09:13 +0000
Subject: [PATCH] -more work on call API

---
 src/include/gnunet_conversation_service.h | 17 +++++++++++------
 src/include/gnunet_protocols.h            | 22 +++++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index d4a48b2b8..098cec9ab 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -259,17 +259,22 @@ enum GNUNET_CONVERSATION_EventCode
    * a `const char *`.  The caller ID will be a GNS name.
    */
   GNUNET_CONVERSATION_EC_RING,
-
-  /**
-   * The phone is busy.  Varargs will be empty.
-   */
-  GNUNET_CONVERSATION_EC_BUSY,
   
   /**
    * We are ready to talk, metadata about the call may be supplied
    * as a `const char *` in the varargs.
    */
   GNUNET_CONVERSATION_EC_READY,
+
+  /**
+   * We failed to locate a phone record in GNS.
+   */
+  GNUNET_CONVERSATION_EC_GNS_FAIL,
+
+  /**
+   * The phone is busy.  Varargs will be empty.
+   */
+  GNUNET_CONVERSATION_EC_BUSY,
   
   /**
    * The conversation was terminated, a reason may be supplied
@@ -410,7 +415,7 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  *        reason given to the other user for why we hung up
  */
 void
-GNUNET_CONVERSATION_call_stop (const struct GNUNET_CONVERSATION_Call *call,
+GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call,
 			       const char *reason);
 
 
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index a2b3ae60d..2cc54401c 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2224,14 +2224,12 @@ extern "C"
 
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_TEST 750
 
-/**
-* Message to transmit the audio
-*/
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO 751
-
-
 
 
+/**
+ * Message to transmit the audio between helper and speaker/microphone library.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO 751
 
 /**
  * Client -> Server message register a phone.
@@ -2256,7 +2254,17 @@ extern "C"
 /**
  * Client <-> Server message to send audio data.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 734
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY 734
+
+/**
+ * Client <-> Server message to send audio data.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 735
+
+/**
+ * Client <-> Server message to send audio data.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 736
 
 
 
-- 
2.25.1