diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-16 05:33:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-16 05:33:01 +0100 |
commit | d23a815951413af100c74b38cdd09a01ca1c280a (patch) | |
tree | 5fd6a3eae1cd4497dc728917362067a8aded3151 /src/conversation | |
parent | a3acd27f0acf30a6c4803ec933c4fe7650bc296c (diff) | |
download | gnunet-d23a815951413af100c74b38cdd09a01ca1c280a.tar.gz gnunet-d23a815951413af100c74b38cdd09a01ca1c280a.zip |
removing dead/legacy server/connection logic, except for in tcp/wlan/bt plugins (which will be updated 'later')
Diffstat (limited to 'src/conversation')
-rw-r--r-- | src/conversation/gnunet-helper-audio-playback.c | 15 | ||||
-rw-r--r-- | src/conversation/microphone.c | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index e965cb2aa..4344e1d41 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -549,7 +549,6 @@ ogg_demux_and_decode () | |||
549 | */ | 549 | */ |
550 | static int | 550 | static int |
551 | stdin_receiver (void *cls, | 551 | stdin_receiver (void *cls, |
552 | void *client, | ||
553 | const struct GNUNET_MessageHeader *msg) | 552 | const struct GNUNET_MessageHeader *msg) |
554 | { | 553 | { |
555 | struct AudioMessage *audio; | 554 | struct AudioMessage *audio; |
@@ -727,12 +726,14 @@ ogg_init () | |||
727 | ogg_sync_init (&oy); | 726 | ogg_sync_init (&oy); |
728 | } | 727 | } |
729 | 728 | ||
729 | |||
730 | static void | 730 | static void |
731 | drain_callback (pa_stream*s, int success, void *userdata) | 731 | drain_callback (pa_stream*s, int success, void *userdata) |
732 | { | 732 | { |
733 | pa_threaded_mainloop_signal (m, 0); | 733 | pa_threaded_mainloop_signal (m, 0); |
734 | } | 734 | } |
735 | 735 | ||
736 | |||
736 | /** | 737 | /** |
737 | * The main function for the playback helper. | 738 | * The main function for the playback helper. |
738 | * | 739 | * |
@@ -746,7 +747,7 @@ main (int argc, char *argv[]) | |||
746 | static unsigned long long toff; | 747 | static unsigned long long toff; |
747 | 748 | ||
748 | char readbuf[MAXLINE]; | 749 | char readbuf[MAXLINE]; |
749 | struct GNUNET_SERVER_MessageStreamTokenizer *stdin_mst; | 750 | struct GNUNET_MessageStreamTokenizer *stdin_mst; |
750 | char c; | 751 | char c; |
751 | ssize_t ret; | 752 | ssize_t ret; |
752 | #ifdef DEBUG_READ_PURE_OGG | 753 | #ifdef DEBUG_READ_PURE_OGG |
@@ -762,7 +763,7 @@ main (int argc, char *argv[]) | |||
762 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe"); | 763 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe"); |
763 | return 1; | 764 | return 1; |
764 | } | 765 | } |
765 | stdin_mst = GNUNET_SERVER_mst_create (&stdin_receiver, NULL); | 766 | stdin_mst = GNUNET_MST_create (&stdin_receiver, NULL); |
766 | ogg_init (); | 767 | ogg_init (); |
767 | pa_init (); | 768 | pa_init (); |
768 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 769 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -802,11 +803,11 @@ main (int argc, char *argv[]) | |||
802 | } | 803 | } |
803 | else | 804 | else |
804 | #endif | 805 | #endif |
805 | GNUNET_SERVER_mst_receive (stdin_mst, NULL, | 806 | GNUNET_MST_from_buffer (stdin_mst, |
806 | readbuf, ret, | 807 | readbuf, ret, |
807 | GNUNET_NO, GNUNET_NO); | 808 | GNUNET_NO, GNUNET_NO); |
808 | } | 809 | } |
809 | GNUNET_SERVER_mst_destroy (stdin_mst); | 810 | GNUNET_MST_destroy (stdin_mst); |
810 | if (stream_out) | 811 | if (stream_out) |
811 | { | 812 | { |
812 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 813 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c index 94f52f8dc..7871433a3 100644 --- a/src/conversation/microphone.c +++ b/src/conversation/microphone.c | |||
@@ -64,13 +64,11 @@ struct Microphone | |||
64 | * Function to process the audio from the record helper | 64 | * Function to process the audio from the record helper |
65 | * | 65 | * |
66 | * @param cls clsoure with our `struct Microphone` | 66 | * @param cls clsoure with our `struct Microphone` |
67 | * @param client NULL | ||
68 | * @param msg the message from the helper | 67 | * @param msg the message from the helper |
69 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 68 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
70 | */ | 69 | */ |
71 | static int | 70 | static int |
72 | process_record_messages (void *cls, | 71 | process_record_messages (void *cls, |
73 | void *client, | ||
74 | const struct GNUNET_MessageHeader *msg) | 72 | const struct GNUNET_MessageHeader *msg) |
75 | { | 73 | { |
76 | struct Microphone *mic = cls; | 74 | struct Microphone *mic = cls; |