diff options
-rw-r--r-- | src/conversation/gnunet-helper-audio-playback.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 6a0831835..903b813ea 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -562,7 +562,7 @@ stdin_receiver (void *cls, | |||
562 | * Callback when data is there for playback | 562 | * Callback when data is there for playback |
563 | */ | 563 | */ |
564 | static void | 564 | static void |
565 | stream_write_callback (pa_stream * s, | 565 | stream_write_callback (pa_stream *s, |
566 | size_t length, | 566 | size_t length, |
567 | void *userdata) | 567 | void *userdata) |
568 | { | 568 | { |
@@ -571,7 +571,7 @@ stream_write_callback (pa_stream * s, | |||
571 | { | 571 | { |
572 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 572 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
573 | "Unblocking main loop!\n"); | 573 | "Unblocking main loop!\n"); |
574 | write (ready_pipe[1], "r", 1); | 574 | (void) write (ready_pipe[1], "r", 1); |
575 | } | 575 | } |
576 | } | 576 | } |
577 | 577 | ||
@@ -580,7 +580,9 @@ stream_write_callback (pa_stream * s, | |||
580 | * Exit callback for SIGTERM and SIGINT | 580 | * Exit callback for SIGTERM and SIGINT |
581 | */ | 581 | */ |
582 | static void | 582 | static void |
583 | exit_signal_callback (pa_mainloop_api * m, pa_signal_event * e, int sig, | 583 | exit_signal_callback (pa_mainloop_api *m, |
584 | pa_signal_event *e, | ||
585 | int sig, | ||
584 | void *userdata) | 586 | void *userdata) |
585 | { | 587 | { |
586 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 588 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
@@ -593,7 +595,7 @@ exit_signal_callback (pa_mainloop_api * m, pa_signal_event * e, int sig, | |||
593 | * Pulseaudio stream state callback | 595 | * Pulseaudio stream state callback |
594 | */ | 596 | */ |
595 | static void | 597 | static void |
596 | context_state_callback (pa_context * c, | 598 | context_state_callback (pa_context *c, |
597 | void *userdata) | 599 | void *userdata) |
598 | { | 600 | { |
599 | int p; | 601 | int p; |
@@ -607,11 +609,11 @@ context_state_callback (pa_context * c, | |||
607 | break; | 609 | break; |
608 | case PA_CONTEXT_READY: | 610 | case PA_CONTEXT_READY: |
609 | { | 611 | { |
610 | GNUNET_assert (!stream_out); | 612 | GNUNET_assert (! stream_out); |
611 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 613 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
612 | _("Connection established.\n")); | 614 | _("Connection established.\n")); |
613 | if (!(stream_out = | 615 | if (! (stream_out = |
614 | pa_stream_new (c, "GNUNET VoIP playback", &sample_spec, NULL))) | 616 | pa_stream_new (c, "GNUNET VoIP playback", &sample_spec, NULL))) |
615 | { | 617 | { |
616 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 618 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
617 | _("pa_stream_new() failed: %s\n"), | 619 | _("pa_stream_new() failed: %s\n"), |