diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-03 16:09:13 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-03 16:09:13 +0000 |
commit | ec3d41bc58ed32ab7678d0b5f04e956d1cf97afc (patch) | |
tree | 60b186ada6a7f1a7a7e31806d69aab7ab81d5f00 /src/include | |
parent | b7ab6c6faaab407d80a3fb4729fc2746555b5010 (diff) | |
download | gnunet-ec3d41bc58ed32ab7678d0b5f04e956d1cf97afc.tar.gz gnunet-ec3d41bc58ed32ab7678d0b5f04e956d1cf97afc.zip |
-more work on call API
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_conversation_service.h | 17 | ||||
-rw-r--r-- | 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 | |||
259 | * a `const char *`. The caller ID will be a GNS name. | 259 | * a `const char *`. The caller ID will be a GNS name. |
260 | */ | 260 | */ |
261 | GNUNET_CONVERSATION_EC_RING, | 261 | GNUNET_CONVERSATION_EC_RING, |
262 | |||
263 | /** | ||
264 | * The phone is busy. Varargs will be empty. | ||
265 | */ | ||
266 | GNUNET_CONVERSATION_EC_BUSY, | ||
267 | 262 | ||
268 | /** | 263 | /** |
269 | * We are ready to talk, metadata about the call may be supplied | 264 | * We are ready to talk, metadata about the call may be supplied |
270 | * as a `const char *` in the varargs. | 265 | * as a `const char *` in the varargs. |
271 | */ | 266 | */ |
272 | GNUNET_CONVERSATION_EC_READY, | 267 | GNUNET_CONVERSATION_EC_READY, |
268 | |||
269 | /** | ||
270 | * We failed to locate a phone record in GNS. | ||
271 | */ | ||
272 | GNUNET_CONVERSATION_EC_GNS_FAIL, | ||
273 | |||
274 | /** | ||
275 | * The phone is busy. Varargs will be empty. | ||
276 | */ | ||
277 | GNUNET_CONVERSATION_EC_BUSY, | ||
273 | 278 | ||
274 | /** | 279 | /** |
275 | * The conversation was terminated, a reason may be supplied | 280 | * The conversation was terminated, a reason may be supplied |
@@ -410,7 +415,7 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
410 | * reason given to the other user for why we hung up | 415 | * reason given to the other user for why we hung up |
411 | */ | 416 | */ |
412 | void | 417 | void |
413 | GNUNET_CONVERSATION_call_stop (const struct GNUNET_CONVERSATION_Call *call, | 418 | GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call, |
414 | const char *reason); | 419 | const char *reason); |
415 | 420 | ||
416 | 421 | ||
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" | |||
2224 | 2224 | ||
2225 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_TEST 750 | 2225 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_TEST 750 |
2226 | 2226 | ||
2227 | /** | ||
2228 | * Message to transmit the audio | ||
2229 | */ | ||
2230 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO 751 | ||
2231 | |||
2232 | |||
2233 | 2227 | ||
2234 | 2228 | ||
2229 | /** | ||
2230 | * Message to transmit the audio between helper and speaker/microphone library. | ||
2231 | */ | ||
2232 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO 751 | ||
2235 | 2233 | ||
2236 | /** | 2234 | /** |
2237 | * Client -> Server message register a phone. | 2235 | * Client -> Server message register a phone. |
@@ -2256,7 +2254,17 @@ extern "C" | |||
2256 | /** | 2254 | /** |
2257 | * Client <-> Server message to send audio data. | 2255 | * Client <-> Server message to send audio data. |
2258 | */ | 2256 | */ |
2259 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 734 | 2257 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY 734 |
2258 | |||
2259 | /** | ||
2260 | * Client <-> Server message to send audio data. | ||
2261 | */ | ||
2262 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 735 | ||
2263 | |||
2264 | /** | ||
2265 | * Client <-> Server message to send audio data. | ||
2266 | */ | ||
2267 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 736 | ||
2260 | 2268 | ||
2261 | 2269 | ||
2262 | 2270 | ||