diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-19 15:13:51 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-19 15:13:51 +0000 |
commit | 9f9e43fe600a07542e04db6b8290a35716749740 (patch) | |
tree | 02eb5a5b50155e60fb4524ea795e3411bc48e92a /src/conversation/test_conversation_api.c | |
parent | b010d57ceed63160940b331218a99aa866c5c915 (diff) | |
download | gnunet-9f9e43fe600a07542e04db6b8290a35716749740.tar.gz gnunet-9f9e43fe600a07542e04db6b8290a35716749740.zip |
-fix test
Diffstat (limited to 'src/conversation/test_conversation_api.c')
-rw-r--r-- | src/conversation/test_conversation_api.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index 4417317fe..f63844c0b 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c | |||
@@ -166,7 +166,7 @@ destroy_speaker (void *cls) | |||
166 | } | 166 | } |
167 | 167 | ||
168 | 168 | ||
169 | static struct GNUNET_SPEAKER_Handle caller_speaker = { | 169 | static struct GNUNET_SPEAKER_Handle call_speaker = { |
170 | &enable_speaker, | 170 | &enable_speaker, |
171 | &play, | 171 | &play, |
172 | &disable_speaker, | 172 | &disable_speaker, |
@@ -180,7 +180,7 @@ static struct GNUNET_SPEAKER_Handle phone_speaker = { | |||
180 | &play, | 180 | &play, |
181 | &disable_speaker, | 181 | &disable_speaker, |
182 | &destroy_speaker, | 182 | &destroy_speaker, |
183 | "caller" | 183 | "phone" |
184 | }; | 184 | }; |
185 | 185 | ||
186 | 186 | ||
@@ -223,14 +223,15 @@ disable_mic (void *cls) | |||
223 | phone_rdc = NULL; | 223 | phone_rdc = NULL; |
224 | phone_rdc_cls = NULL; | 224 | phone_rdc_cls = NULL; |
225 | GNUNET_SCHEDULER_cancel (phone_task); | 225 | GNUNET_SCHEDULER_cancel (phone_task); |
226 | phone_task = GNUNET_SCHEDULER_NO_TASK; | ||
226 | } | 227 | } |
227 | else | 228 | else |
228 | { | 229 | { |
229 | call_rdc = NULL; | 230 | call_rdc = NULL; |
230 | call_rdc_cls = NULL; | 231 | call_rdc_cls = NULL; |
231 | GNUNET_SCHEDULER_cancel (call_task); | 232 | GNUNET_SCHEDULER_cancel (call_task); |
233 | call_task = GNUNET_SCHEDULER_NO_TASK; | ||
232 | } | 234 | } |
233 | |||
234 | } | 235 | } |
235 | 236 | ||
236 | 237 | ||
@@ -245,7 +246,7 @@ destroy_mic (void *cls) | |||
245 | } | 246 | } |
246 | 247 | ||
247 | 248 | ||
248 | static struct GNUNET_MICROPHONE_Handle caller_mic = { | 249 | static struct GNUNET_MICROPHONE_Handle call_mic = { |
249 | &enable_mic, | 250 | &enable_mic, |
250 | &disable_mic, | 251 | &disable_mic, |
251 | &destroy_mic, | 252 | &destroy_mic, |
@@ -257,7 +258,7 @@ static struct GNUNET_MICROPHONE_Handle phone_mic = { | |||
257 | &enable_mic, | 258 | &enable_mic, |
258 | &disable_mic, | 259 | &disable_mic, |
259 | &destroy_mic, | 260 | &destroy_mic, |
260 | "caller" | 261 | "phone" |
261 | }; | 262 | }; |
262 | 263 | ||
263 | 264 | ||
@@ -450,8 +451,8 @@ identity_cb (void *cls, | |||
450 | call = GNUNET_CONVERSATION_call_start (cfg, | 451 | call = GNUNET_CONVERSATION_call_start (cfg, |
451 | ego, | 452 | ego, |
452 | gns_name, | 453 | gns_name, |
453 | &caller_speaker, | 454 | &call_speaker, |
454 | &caller_mic, | 455 | &call_mic, |
455 | &call_event_handler, | 456 | &call_event_handler, |
456 | NULL); | 457 | NULL); |
457 | return; | 458 | return; |