aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/conversation_api_call.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-11-19 15:06:33 +0000
committerChristian Grothoff <christian@grothoff.org>2013-11-19 15:06:33 +0000
commit060527201fe3cdfc6d892bc7b90e6e6a6745cb78 (patch)
tree756d70b1c46b8f518854ab39e5de79bcdcf2aaa8 /src/conversation/conversation_api_call.c
parent06e79ff3d4ef352ad14d520f4ec503e842e76593 (diff)
downloadgnunet-060527201fe3cdfc6d892bc7b90e6e6a6745cb78.tar.gz
gnunet-060527201fe3cdfc6d892bc7b90e6e6a6745cb78.zip
-cleaner callback sequencing
Diffstat (limited to 'src/conversation/conversation_api_call.c')
-rw-r--r--src/conversation/conversation_api_call.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index 20992c6b5..8722e2452 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -254,12 +254,12 @@ handle_call_resume (void *cls,
254 break; 254 break;
255 case CS_SUSPENDED_CALLEE: 255 case CS_SUSPENDED_CALLEE:
256 call->state = CS_ACTIVE; 256 call->state = CS_ACTIVE;
257 call->event_handler (call->event_handler_cls,
258 GNUNET_CONVERSATION_EC_CALL_RESUMED);
259 call->speaker->enable_speaker (call->speaker->cls); 257 call->speaker->enable_speaker (call->speaker->cls);
260 call->mic->enable_microphone (call->mic->cls, 258 call->mic->enable_microphone (call->mic->cls,
261 &transmit_call_audio, 259 &transmit_call_audio,
262 call); 260 call);
261 call->event_handler (call->event_handler_cls,
262 GNUNET_CONVERSATION_EC_CALL_RESUMED);
263 break; 263 break;
264 case CS_SUSPENDED_BOTH: 264 case CS_SUSPENDED_BOTH:
265 call->state = CS_SUSPENDED_CALLER; 265 call->state = CS_SUSPENDED_CALLER;
@@ -296,12 +296,12 @@ handle_call_picked_up (void *cls,
296 break; 296 break;
297 case CS_RINGING: 297 case CS_RINGING:
298 call->state = CS_ACTIVE; 298 call->state = CS_ACTIVE;
299 call->event_handler (call->event_handler_cls,
300 GNUNET_CONVERSATION_EC_CALL_PICKED_UP);
301 call->speaker->enable_speaker (call->speaker->cls); 299 call->speaker->enable_speaker (call->speaker->cls);
302 call->mic->enable_microphone (call->mic->cls, 300 call->mic->enable_microphone (call->mic->cls,
303 &transmit_call_audio, 301 &transmit_call_audio,
304 call); 302 call);
303 call->event_handler (call->event_handler_cls,
304 GNUNET_CONVERSATION_EC_CALL_PICKED_UP);
305 break; 305 break;
306 case CS_SUSPENDED_CALLER: 306 case CS_SUSPENDED_CALLER:
307 case CS_SUSPENDED_CALLEE: 307 case CS_SUSPENDED_CALLEE: