aboutsummaryrefslogtreecommitdiff
path: root/src/conversation
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-12-30 20:46:59 +0100
committerlurchi <lurchi@strangeplace.net>2017-12-30 20:46:59 +0100
commit5c8feda7faa01365a1fb6983595ceb65dfe4fb11 (patch)
tree3521d1131a2f3d063455a58c86c42af3c7551077 /src/conversation
parentd01f1bd83384cbdb74fa963526d31270bf58c805 (diff)
parent8412625bb5191040389610364167c768bb55efb4 (diff)
downloadgnunet-5c8feda7faa01365a1fb6983595ceb65dfe4fb11.tar.gz
gnunet-5c8feda7faa01365a1fb6983595ceb65dfe4fb11.zip
Merge branch 'fix_social'
Diffstat (limited to 'src/conversation')
-rw-r--r--src/conversation/gnunet-helper-audio-playback-gst.c5
-rw-r--r--src/conversation/gnunet-helper-audio-playback.c5
-rw-r--r--src/conversation/gnunet_gst.c5
-rw-r--r--src/conversation/microphone.c4
4 files changed, 18 insertions, 1 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c b/src/conversation/gnunet-helper-audio-playback-gst.c
index 264b14e76..002fed6c7 100644
--- a/src/conversation/gnunet-helper-audio-playback-gst.c
+++ b/src/conversation/gnunet-helper-audio-playback-gst.c
@@ -221,6 +221,11 @@ feed_buffer_to_gst (const char *audio, size_t b_len)
221 221
222/** 222/**
223 * Message callback 223 * Message callback
224 *
225 * @param msg message we received.
226 * @return #GNUNET_OK on success,
227 * #GNUNET_NO to stop further processing due to disconnect (no error)
228 * #GNUNET_SYSERR to stop further processing due to error
224 */ 229 */
225static int 230static int
226stdin_receiver (void *cls, 231stdin_receiver (void *cls,
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c
index 4344e1d41..18f63ad18 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -546,6 +546,11 @@ ogg_demux_and_decode ()
546 546
547/** 547/**
548 * Message callback 548 * Message callback
549 *
550 * @param msg message we received.
551 * @return #GNUNET_OK on success,
552 * #GNUNET_NO to stop further processing due to disconnect (no error)
553 * #GNUNET_SYSERR to stop further processing due to error
549 */ 554 */
550static int 555static int
551stdin_receiver (void *cls, 556stdin_receiver (void *cls,
diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c
index 52cb2ccbc..828b35077 100644
--- a/src/conversation/gnunet_gst.c
+++ b/src/conversation/gnunet_gst.c
@@ -649,6 +649,11 @@ gnunet_read (GNUNET_gstData * d)
649 649
650/** 650/**
651 * Message callback 651 * Message callback
652 *
653 * @param msg message we received.
654 * @return #GNUNET_OK on success,
655 * #GNUNET_NO to stop further processing due to disconnect (no error)
656 * #GNUNET_SYSERR to stop further processing due to error
652 */ 657 */
653static int 658static int
654stdin_receiver (void *cls, 659stdin_receiver (void *cls,
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c
index 7871433a3..11468fc59 100644
--- a/src/conversation/microphone.c
+++ b/src/conversation/microphone.c
@@ -65,7 +65,9 @@ struct Microphone
65 * 65 *
66 * @param cls clsoure with our `struct Microphone` 66 * @param cls clsoure with our `struct Microphone`
67 * @param msg the message from the helper 67 * @param msg the message from the helper
68 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error 68 * @return #GNUNET_OK on success,
69 * #GNUNET_NO to stop further processing (no error)
70 * #GNUNET_SYSERR to stop further processing with error
69 */ 71 */
70static int 72static int
71process_record_messages (void *cls, 73process_record_messages (void *cls,