aboutsummaryrefslogtreecommitdiff
path: root/src/conversation
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-12-08 23:40:32 +0000
committerChristian Grothoff <christian@grothoff.org>2013-12-08 23:40:32 +0000
commiteedb4723298c710ce6d9bfb422251120d8014f58 (patch)
treee4aa0743883ac94090e7befcd96a9ab1f0a3e814 /src/conversation
parentc937a1623b7fde5ff51c0055c0b3b65921a1f67d (diff)
downloadgnunet-eedb4723298c710ce6d9bfb422251120d8014f58.tar.gz
gnunet-eedb4723298c710ce6d9bfb422251120d8014f58.zip
-style fixes
Diffstat (limited to 'src/conversation')
-rw-r--r--src/conversation/gnunet-helper-audio-playback.c6
-rw-r--r--src/conversation/gnunet-helper-audio-record.c15
2 files changed, 10 insertions, 11 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c
index 97abd4430..fcf07707d 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -19,7 +19,7 @@
19*/ 19*/
20/** 20/**
21 * @file conversation/gnunet-helper-audio-playback.c 21 * @file conversation/gnunet-helper-audio-playback.c
22 * @brief constants for network protocols 22 * @brief program to playback audio data to the speaker
23 * @author Siomon Dieterle 23 * @author Siomon Dieterle
24 * @author Andreas Fuchs 24 * @author Andreas Fuchs
25 * @author Christian Grothoff 25 * @author Christian Grothoff
@@ -335,8 +335,8 @@ main (int argc, char *argv[])
335 335
336 GNUNET_assert (GNUNET_OK == 336 GNUNET_assert (GNUNET_OK ==
337 GNUNET_log_setup ("gnunet-helper-audio-playback", 337 GNUNET_log_setup ("gnunet-helper-audio-playback",
338 "DEBUG", 338 "WARNING",
339 "/tmp/helper-audio-playback")); 339 NULL));
340 if (0 != pipe (ready_pipe)) 340 if (0 != pipe (ready_pipe))
341 { 341 {
342 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe"); 342 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c
index 5e42de2b5..890312213 100644
--- a/src/conversation/gnunet-helper-audio-record.c
+++ b/src/conversation/gnunet-helper-audio-record.c
@@ -18,8 +18,8 @@
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20/** 20/**
21 * @file conversation/gnunet-helper-audio-playback.c 21 * @file conversation/gnunet-helper-audio-record.c
22 * @brief constants for network protocols 22 * @brief program to record audio data from the microphone
23 * @author Siomon Dieterle 23 * @author Siomon Dieterle
24 * @author Andreas Fuchs 24 * @author Andreas Fuchs
25 * @author Christian Grothoff 25 * @author Christian Grothoff
@@ -293,9 +293,8 @@ stream_state_callback (pa_stream * s, void *userdata)
293 case PA_STREAM_READY: 293 case PA_STREAM_READY:
294 { 294 {
295 const pa_buffer_attr *a; 295 const pa_buffer_attr *a;
296 296 char cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
297 char cmt[PA_CHANNEL_MAP_SNPRINT_MAX], 297 char sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
298 sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
299 298
300 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 299 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
301 _("Stream successfully created.\n")); 300 _("Stream successfully created.\n"));
@@ -306,7 +305,7 @@ stream_state_callback (pa_stream * s, void *userdata)
306 _("pa_stream_get_buffer_attr() failed: %s\n"), 305 _("pa_stream_get_buffer_attr() failed: %s\n"),
307 pa_strerror (pa_context_errno 306 pa_strerror (pa_context_errno
308 (pa_stream_get_context (s)))); 307 (pa_stream_get_context (s))));
309 308
310 } 309 }
311 else 310 else
312 { 311 {
@@ -492,8 +491,8 @@ main (int argc, char *argv[])
492{ 491{
493 GNUNET_assert (GNUNET_OK == 492 GNUNET_assert (GNUNET_OK ==
494 GNUNET_log_setup ("gnunet-helper-audio-record", 493 GNUNET_log_setup ("gnunet-helper-audio-record",
495 "DEBUG", 494 "WARNING",
496 "/tmp/helper-audio-record")); 495 NULL));
497 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 496 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
498 "Audio source starts\n"); 497 "Audio source starts\n");
499 audio_message = GNUNET_malloc (UINT16_MAX); 498 audio_message = GNUNET_malloc (UINT16_MAX);