diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-31 13:03:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-31 13:03:48 +0100 |
commit | 7e3cf5f461eb4fbb7581672bf0835da07c378136 (patch) | |
tree | bdc3874b7894242b095b892f1ed3e81a4d4f06c0 /src/conversation | |
parent | 01b480d6d026e0c537dc284a7e7df2c0320a3528 (diff) | |
download | gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.tar.gz gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.zip |
tighten formatting rules
Diffstat (limited to 'src/conversation')
-rw-r--r-- | src/conversation/conversation_api.c | 2 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-test.c | 1 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation.c | 4 | ||||
-rw-r--r-- | src/conversation/gnunet-helper-audio-playback.c | 21 | ||||
-rw-r--r-- | src/conversation/gnunet-helper-audio-record-gst.c | 3 | ||||
-rw-r--r-- | src/conversation/gnunet-helper-audio-record.c | 1 | ||||
-rw-r--r-- | src/conversation/gnunet_gst.c | 35 | ||||
-rw-r--r-- | src/conversation/gnunet_gst_def.h | 3 | ||||
-rw-r--r-- | src/conversation/gnunet_gst_test.c | 8 | ||||
-rw-r--r-- | src/conversation/microphone.c | 1 | ||||
-rw-r--r-- | src/conversation/plugin_gnsrecord_conversation.c | 1 | ||||
-rw-r--r-- | src/conversation/speaker.c | 1 | ||||
-rw-r--r-- | src/conversation/test_conversation_api.c | 1 | ||||
-rw-r--r-- | src/conversation/test_conversation_api_reject.c | 1 | ||||
-rw-r--r-- | src/conversation/test_conversation_api_twocalls.c | 1 |
15 files changed, 46 insertions, 38 deletions
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index eb070e56e..daf51042a 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -62,7 +62,6 @@ enum CallerState | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | 64 | ||
65 | |||
66 | /** | 65 | /** |
67 | * A caller is the handle we have for an incoming call. | 66 | * A caller is the handle we have for an incoming call. |
68 | */ | 67 | */ |
@@ -867,4 +866,5 @@ GNUNET_CONVERSATION_caller_resume (struct GNUNET_CONVERSATION_Caller *caller, | |||
867 | } | 866 | } |
868 | } | 867 | } |
869 | 868 | ||
869 | |||
870 | /* end of conversation_api.c */ | 870 | /* end of conversation_api.c */ |
diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c index c03723fc3..307b55435 100644 --- a/src/conversation/gnunet-conversation-test.c +++ b/src/conversation/gnunet-conversation-test.c | |||
@@ -261,4 +261,5 @@ main (int argc, | |||
261 | return ret; | 261 | return ret; |
262 | } | 262 | } |
263 | 263 | ||
264 | |||
264 | /* end of gnunet-conversation-test.c */ | 265 | /* end of gnunet-conversation-test.c */ |
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 0b04ba38e..6c0a6e42f 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c | |||
@@ -258,8 +258,7 @@ phone_event_handler (void *cls, | |||
258 | ring_my_bell(); | 258 | ring_my_bell(); |
259 | * | 259 | * |
260 | * see https://gstreamer.freedesktop.org/documentation/application-development/highlevel/playback-components.html on how to play a wav using the gst framework being used here | 260 | * see https://gstreamer.freedesktop.org/documentation/application-development/highlevel/playback-components.html on how to play a wav using the gst framework being used here |
261 | */ | 261 | */fprintf ( |
262 | fprintf ( | ||
263 | stdout, | 262 | stdout, |
264 | _ ( | 263 | _ ( |
265 | "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"), | 264 | "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"), |
@@ -1229,4 +1228,5 @@ main (int argc, char *const *argv) | |||
1229 | return (GNUNET_OK == ret) ? 0 : 1; | 1228 | return (GNUNET_OK == ret) ? 0 : 1; |
1230 | } | 1229 | } |
1231 | 1230 | ||
1231 | |||
1232 | /* end of gnunet-conversation.c */ | 1232 | /* end of gnunet-conversation.c */ |
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index d7e1cd036..dfa400d71 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -262,6 +262,7 @@ write_wav_header () | |||
262 | return ! ret ? -1 : 16; | 262 | return ! ret ? -1 : 16; |
263 | } | 263 | } |
264 | 264 | ||
265 | |||
265 | #endif | 266 | #endif |
266 | 267 | ||
267 | 268 | ||
@@ -397,7 +398,7 @@ ogg_demux_and_decode () | |||
397 | { | 398 | { |
398 | /*OggOpus streams are identified by a magic string in the initial | 399 | /*OggOpus streams are identified by a magic string in the initial |
399 | stream header.*/ | 400 | stream header.*/ |
400 | if (op.b_o_s &&(op.bytes >= 8) && ! memcmp (op.packet, "OpusHead", 8)) | 401 | if (op.b_o_s && (op.bytes >= 8) && ! memcmp (op.packet, "OpusHead", 8)) |
401 | { | 402 | { |
402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 403 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
403 | "Got Opus Header\n"); | 404 | "Got Opus Header\n"); |
@@ -418,7 +419,7 @@ ogg_demux_and_decode () | |||
418 | } | 419 | } |
419 | if (! has_opus_stream) | 420 | if (! has_opus_stream) |
420 | { | 421 | { |
421 | if ((packet_count > 0) &&(opus_serialno == os.serialno) ) | 422 | if ((packet_count > 0) && (opus_serialno == os.serialno) ) |
422 | { | 423 | { |
423 | fprintf (stderr, | 424 | fprintf (stderr, |
424 | "\nError: Apparent chaining without changing serial number (%" | 425 | "\nError: Apparent chaining without changing serial number (%" |
@@ -443,7 +444,7 @@ ogg_demux_and_decode () | |||
443 | (int64_t) os.serialno); | 444 | (int64_t) os.serialno); |
444 | } | 445 | } |
445 | } | 446 | } |
446 | if (! has_opus_stream ||(os.serialno != opus_serialno) ) | 447 | if (! has_opus_stream || (os.serialno != opus_serialno) ) |
447 | { | 448 | { |
448 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 449 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
449 | "breaking out\n"); | 450 | "breaking out\n"); |
@@ -458,9 +459,9 @@ ogg_demux_and_decode () | |||
458 | if (! dec) | 459 | if (! dec) |
459 | quit (1); | 460 | quit (1); |
460 | 461 | ||
461 | if ((0 != ogg_stream_packetout (&os, &op)) ||(255 == | 462 | if ((0 != ogg_stream_packetout (&os, &op)) || (255 == |
462 | og.header[og.header_len | 463 | og.header[og.header_len |
463 | - 1]) ) | 464 | - 1]) ) |
464 | { | 465 | { |
465 | /*The format specifies that the initial header and tags packets are on their | 466 | /*The format specifies that the initial header and tags packets are on their |
466 | own pages. To aid implementors in discovering that their files are wrong | 467 | own pages. To aid implementors in discovering that their files are wrong |
@@ -490,9 +491,9 @@ ogg_demux_and_decode () | |||
490 | else if (1 == packet_count) | 491 | else if (1 == packet_count) |
491 | { | 492 | { |
492 | has_tags_packet = 1; | 493 | has_tags_packet = 1; |
493 | if ((0 != ogg_stream_packetout (&os, &op)) ||(255 == | 494 | if ((0 != ogg_stream_packetout (&os, &op)) || (255 == |
494 | og.header[og.header_len | 495 | og.header[og.header_len |
495 | - 1]) ) | 496 | - 1]) ) |
496 | { | 497 | { |
497 | fprintf (stderr, | 498 | fprintf (stderr, |
498 | "Extra packets on initial tags page. Invalid stream.\n"); | 499 | "Extra packets on initial tags page. Invalid stream.\n"); |
@@ -506,7 +507,7 @@ ogg_demux_and_decode () | |||
506 | int64_t outsamp; | 507 | int64_t outsamp; |
507 | 508 | ||
508 | /*End of stream condition*/ | 509 | /*End of stream condition*/ |
509 | if (op.e_o_s &&(os.serialno == opus_serialno) ) | 510 | if (op.e_o_s && (os.serialno == opus_serialno) ) |
510 | { | 511 | { |
511 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 512 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
512 | "Got EOS\n"); | 513 | "Got EOS\n"); |
diff --git a/src/conversation/gnunet-helper-audio-record-gst.c b/src/conversation/gnunet-helper-audio-record-gst.c index a3607014e..883dd9eea 100644 --- a/src/conversation/gnunet-helper-audio-record-gst.c +++ b/src/conversation/gnunet-helper-audio-record-gst.c | |||
@@ -108,6 +108,7 @@ quit () | |||
108 | gst_element_set_state (pipeline, GST_STATE_NULL); | 108 | gst_element_set_state (pipeline, GST_STATE_NULL); |
109 | } | 109 | } |
110 | 110 | ||
111 | |||
111 | static gboolean | 112 | static gboolean |
112 | bus_call (GstBus *bus, GstMessage *msg, gpointer data) | 113 | bus_call (GstBus *bus, GstMessage *msg, gpointer data) |
113 | { | 114 | { |
@@ -141,6 +142,7 @@ bus_call (GstBus *bus, GstMessage *msg, gpointer data) | |||
141 | return TRUE; | 142 | return TRUE; |
142 | } | 143 | } |
143 | 144 | ||
145 | |||
144 | void | 146 | void |
145 | source_child_added (GstChildProxy *child_proxy, GObject *object, gchar *name, | 147 | source_child_added (GstChildProxy *child_proxy, GObject *object, gchar *name, |
146 | gpointer user_data) | 148 | gpointer user_data) |
@@ -150,6 +152,7 @@ source_child_added (GstChildProxy *child_proxy, GObject *object, gchar *name, | |||
150 | (gint64) LATENCY_TIME, NULL); | 152 | (gint64) LATENCY_TIME, NULL); |
151 | } | 153 | } |
152 | 154 | ||
155 | |||
153 | static void | 156 | static void |
154 | signalhandler (int s) | 157 | signalhandler (int s) |
155 | { | 158 | { |
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index 16311cf69..633030a64 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c | |||
@@ -774,6 +774,7 @@ ogg_init () | |||
774 | } | 774 | } |
775 | } | 775 | } |
776 | 776 | ||
777 | |||
777 | /** | 778 | /** |
778 | * The main function for the record helper. | 779 | * The main function for the record helper. |
779 | * | 780 | * |
diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c index 7703215bb..d776189cd 100644 --- a/src/conversation/gnunet_gst.c +++ b/src/conversation/gnunet_gst.c | |||
@@ -62,6 +62,7 @@ BREAKOUT: | |||
62 | return; | 62 | return; |
63 | } | 63 | } |
64 | 64 | ||
65 | |||
65 | /*** | 66 | /*** |
66 | * load gnunet configuration | 67 | * load gnunet configuration |
67 | */ | 68 | */ |
@@ -142,6 +143,7 @@ gg_load_configuration (GNUNET_gstData *d) | |||
142 | // GNUNET_CONFIGURATION_write(cfg, "mediahelper.conf"); | 143 | // GNUNET_CONFIGURATION_write(cfg, "mediahelper.conf"); |
143 | } | 144 | } |
144 | 145 | ||
146 | |||
145 | static void | 147 | static void |
146 | write_data (const char *ptr, size_t msg_size) | 148 | write_data (const char *ptr, size_t msg_size) |
147 | { | 149 | { |
@@ -163,7 +165,6 @@ write_data (const char *ptr, size_t msg_size) | |||
163 | } | 165 | } |
164 | 166 | ||
165 | 167 | ||
166 | |||
167 | extern GstFlowReturn | 168 | extern GstFlowReturn |
168 | on_appsink_new_sample (GstElement *element, GNUNET_gstData *d) | 169 | on_appsink_new_sample (GstElement *element, GNUNET_gstData *d) |
169 | { | 170 | { |
@@ -179,9 +180,7 @@ on_appsink_new_sample (GstElement *element, GNUNET_gstData *d) | |||
179 | char *si_str; | 180 | char *si_str; |
180 | GstCaps *s_caps; | 181 | GstCaps *s_caps; |
181 | char *caps_str; | 182 | char *caps_str; |
182 | */ | 183 | */if (gst_app_sink_is_eos (GST_APP_SINK (element))) |
183 | |||
184 | if (gst_app_sink_is_eos (GST_APP_SINK (element))) | ||
185 | return GST_FLOW_OK; | 184 | return GST_FLOW_OK; |
186 | 185 | ||
187 | // pull sample from appsink | 186 | // pull sample from appsink |
@@ -198,7 +197,6 @@ on_appsink_new_sample (GstElement *element, GNUNET_gstData *d) | |||
198 | GST_WARNING ("caps are %" GST_PTR_FORMAT, gst_sample_get_caps (s)); | 197 | GST_WARNING ("caps are %" GST_PTR_FORMAT, gst_sample_get_caps (s)); |
199 | 198 | ||
200 | 199 | ||
201 | |||
202 | gst_buffer_map (b, &map, GST_MAP_READ); | 200 | gst_buffer_map (b, &map, GST_MAP_READ); |
203 | 201 | ||
204 | size_t len; | 202 | size_t len; |
@@ -226,6 +224,7 @@ on_appsink_new_sample (GstElement *element, GNUNET_gstData *d) | |||
226 | return GST_FLOW_OK; | 224 | return GST_FLOW_OK; |
227 | } | 225 | } |
228 | 226 | ||
227 | |||
229 | /*** | 228 | /*** |
230 | * Dump a pipeline graph | 229 | * Dump a pipeline graph |
231 | */ | 230 | */ |
@@ -248,7 +247,6 @@ pl_graph (GstElement *pipeline) | |||
248 | } | 247 | } |
249 | 248 | ||
250 | 249 | ||
251 | |||
252 | extern gboolean | 250 | extern gboolean |
253 | gnunet_gst_bus_call (GstBus *bus, GstMessage *msg, gpointer data) | 251 | gnunet_gst_bus_call (GstBus *bus, GstMessage *msg, gpointer data) |
254 | { | 252 | { |
@@ -286,6 +284,7 @@ gnunet_gst_bus_call (GstBus *bus, GstMessage *msg, gpointer data) | |||
286 | return TRUE; | 284 | return TRUE; |
287 | } | 285 | } |
288 | 286 | ||
287 | |||
289 | /* called when pipeline changes state */ | 288 | /* called when pipeline changes state */ |
290 | extern void | 289 | extern void |
291 | state_changed_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *d) | 290 | state_changed_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *d) |
@@ -326,6 +325,7 @@ state_changed_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *d) | |||
326 | } | 325 | } |
327 | } | 326 | } |
328 | 327 | ||
328 | |||
329 | static void | 329 | static void |
330 | application_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) | 330 | application_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) |
331 | { | 331 | { |
@@ -333,6 +333,7 @@ application_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) | |||
333 | return; | 333 | return; |
334 | } | 334 | } |
335 | 335 | ||
336 | |||
336 | static void | 337 | static void |
337 | error_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) | 338 | error_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) |
338 | { | 339 | { |
@@ -340,6 +341,7 @@ error_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) | |||
340 | return; | 341 | return; |
341 | } | 342 | } |
342 | 343 | ||
344 | |||
343 | static void | 345 | static void |
344 | eos_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) | 346 | eos_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) |
345 | { | 347 | { |
@@ -347,6 +349,7 @@ eos_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data) | |||
347 | return; | 349 | return; |
348 | } | 350 | } |
349 | 351 | ||
352 | |||
350 | extern void | 353 | extern void |
351 | gg_setup_gst_bus (GNUNET_gstData *d) | 354 | gg_setup_gst_bus (GNUNET_gstData *d) |
352 | { | 355 | { |
@@ -367,6 +370,7 @@ gg_setup_gst_bus (GNUNET_gstData *d) | |||
367 | gst_object_unref (bus); | 370 | gst_object_unref (bus); |
368 | } | 371 | } |
369 | 372 | ||
373 | |||
370 | /* | 374 | /* |
371 | * take buffer from gstreamer and feed it to gnunet | 375 | * take buffer from gstreamer and feed it to gnunet |
372 | */ | 376 | */ |
@@ -543,7 +547,6 @@ feed_buffer_to_gst (const char *audio, size_t b_len, GNUNET_gstData *d) | |||
543 | } | 547 | } |
544 | 548 | ||
545 | 549 | ||
546 | |||
547 | /** | 550 | /** |
548 | * debug making elements | 551 | * debug making elements |
549 | */ | 552 | */ |
@@ -567,6 +570,7 @@ gst_element_factory_make_debug (gchar *factoryname, gchar *name) | |||
567 | } | 570 | } |
568 | } | 571 | } |
569 | 572 | ||
573 | |||
570 | /* | 574 | /* |
571 | static gboolean | 575 | static gboolean |
572 | gst_element_link_many_debug(...) | 576 | gst_element_link_many_debug(...) |
@@ -585,6 +589,7 @@ lf (char *msg) | |||
585 | exit (10); | 589 | exit (10); |
586 | } | 590 | } |
587 | 591 | ||
592 | |||
588 | /*** | 593 | /*** |
589 | * used to set properties on autoaudiosink's chosen sink | 594 | * used to set properties on autoaudiosink's chosen sink |
590 | */ | 595 | */ |
@@ -601,6 +606,7 @@ autoaudiosink_child_added (GstChildProxy *child_proxy, | |||
601 | NULL); | 606 | NULL); |
602 | } | 607 | } |
603 | 608 | ||
609 | |||
604 | /*** | 610 | /*** |
605 | * used to set properties on autoaudiosource's chosen sink | 611 | * used to set properties on autoaudiosource's chosen sink |
606 | */ | 612 | */ |
@@ -624,6 +630,7 @@ get_pipeline (GstElement *element) | |||
624 | return GST_ELEMENT (p); | 630 | return GST_ELEMENT (p); |
625 | } | 631 | } |
626 | 632 | ||
633 | |||
627 | static void | 634 | static void |
628 | decoder_ogg_pad_added (GstElement *element, | 635 | decoder_ogg_pad_added (GstElement *element, |
629 | GstPad *pad, | 636 | GstPad *pad, |
@@ -682,6 +689,7 @@ gnunet_read (GNUNET_gstData *d) | |||
682 | return 0; | 689 | return 0; |
683 | } | 690 | } |
684 | 691 | ||
692 | |||
685 | /** | 693 | /** |
686 | * Message callback | 694 | * Message callback |
687 | * | 695 | * |
@@ -802,6 +810,7 @@ get_app (GNUNET_gstData *d, int type) | |||
802 | return bin; | 810 | return bin; |
803 | } | 811 | } |
804 | 812 | ||
813 | |||
805 | extern GstBin * | 814 | extern GstBin * |
806 | get_coder (GNUNET_gstData *d, int type) | 815 | get_coder (GNUNET_gstData *d, int type) |
807 | { | 816 | { |
@@ -824,8 +833,7 @@ get_coder (GNUNET_gstData *d, int type) | |||
824 | "sprop-stereo", G_TYPE_STRING, "0", | 833 | "sprop-stereo", G_TYPE_STRING, "0", |
825 | "encoding-params", G_TYPE_STRING, "2", | 834 | "encoding-params", G_TYPE_STRING, "2", |
826 | NULL); | 835 | NULL); |
827 | */ | 836 | */ rtpcaps = gst_caps_new_simple ("application/x-rtp", |
828 | rtpcaps = gst_caps_new_simple ("application/x-rtp", | ||
829 | "media", G_TYPE_STRING, "audio", | 837 | "media", G_TYPE_STRING, "audio", |
830 | "clock-rate", G_TYPE_INT, SAMPLING_RATE, | 838 | "clock-rate", G_TYPE_INT, SAMPLING_RATE, |
831 | "encoding-name", G_TYPE_STRING, "OPUS", | 839 | "encoding-name", G_TYPE_STRING, "OPUS", |
@@ -1013,8 +1021,7 @@ get_audiobin (GNUNET_gstData *d, int type) | |||
1013 | "enough-data", | 1021 | "enough-data", |
1014 | G_CALLBACK(appsrc_enough_data), | 1022 | G_CALLBACK(appsrc_enough_data), |
1015 | NULL); | 1023 | NULL); |
1016 | */ | 1024 | *//* |
1017 | /* | ||
1018 | g_signal_connect (queue, | 1025 | g_signal_connect (queue, |
1019 | "notify::current-level-bytes", | 1026 | "notify::current-level-bytes", |
1020 | G_CALLBACK(queue_current_level), | 1027 | G_CALLBACK(queue_current_level), |
@@ -1039,11 +1046,7 @@ get_audiobin (GNUNET_gstData *d, int type) | |||
1039 | "pushing", | 1046 | "pushing", |
1040 | G_CALLBACK(queue_pushing), | 1047 | G_CALLBACK(queue_pushing), |
1041 | NULL); | 1048 | NULL); |
1042 | */ | 1049 | */ } |
1043 | } | ||
1044 | |||
1045 | |||
1046 | |||
1047 | 1050 | ||
1048 | 1051 | ||
1049 | gst_bin_add_many (bin, conv, resampler, sink, NULL); | 1052 | gst_bin_add_many (bin, conv, resampler, sink, NULL); |
diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h index bbadc5f92..7bfcc5e53 100644 --- a/src/conversation/gnunet_gst_def.h +++ b/src/conversation/gnunet_gst_def.h | |||
@@ -84,7 +84,6 @@ | |||
84 | // static struct AudioMessage *audio_message; | 84 | // static struct AudioMessage *audio_message; |
85 | 85 | ||
86 | 86 | ||
87 | |||
88 | typedef struct GNUNET_gstData GNUNET_gstData; | 87 | typedef struct GNUNET_gstData GNUNET_gstData; |
89 | struct GNUNET_gstData | 88 | struct GNUNET_gstData |
90 | { | 89 | { |
@@ -106,8 +105,6 @@ struct GNUNET_gstData | |||
106 | }; | 105 | }; |
107 | 106 | ||
108 | 107 | ||
109 | |||
110 | |||
111 | #define DEBUG_READ_PURE_OGG 1 | 108 | #define DEBUG_READ_PURE_OGG 1 |
112 | #define DEBUG_RECORD_PURE_OGG 1 | 109 | #define DEBUG_RECORD_PURE_OGG 1 |
113 | 110 | ||
diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c index 884b0fe83..98054797c 100644 --- a/src/conversation/gnunet_gst_test.c +++ b/src/conversation/gnunet_gst_test.c | |||
@@ -34,7 +34,6 @@ main (int argc, char *argv[]) | |||
34 | GstElement *gnunetsrc, *gnunetsink, *source, *sink, *encoder, *decoder; | 34 | GstElement *gnunetsrc, *gnunetsink, *source, *sink, *encoder, *decoder; |
35 | 35 | ||
36 | 36 | ||
37 | |||
38 | // audio_message = GNUNET_malloc (UINT16_MAX); | 37 | // audio_message = GNUNET_malloc (UINT16_MAX); |
39 | // audio_message->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO); | 38 | // audio_message->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO); |
40 | 39 | ||
@@ -51,9 +50,7 @@ main (int argc, char *argv[]) | |||
51 | gst->audiobackend = JACK; | 50 | gst->audiobackend = JACK; |
52 | gst->dropsilence = TRUE; | 51 | gst->dropsilence = TRUE; |
53 | gst->usertp = FALSE; | 52 | gst->usertp = FALSE; |
54 | */ | 53 | *//* Initialize GStreamer */gst_init (&argc, &argv); |
55 | /* Initialize GStreamer */ | ||
56 | gst_init (&argc, &argv); | ||
57 | 54 | ||
58 | gst->pipeline = GST_PIPELINE (gst_pipeline_new ("gnunet-media-helper")); | 55 | gst->pipeline = GST_PIPELINE (gst_pipeline_new ("gnunet-media-helper")); |
59 | 56 | ||
@@ -118,8 +115,7 @@ main (int argc, char *argv[]) | |||
118 | GstFlowReturn flow; | 115 | GstFlowReturn flow; |
119 | flow = on_appsink_new_sample (gst->appsink, gst); | 116 | flow = on_appsink_new_sample (gst->appsink, gst); |
120 | } | 117 | } |
121 | */ | 118 | */} |
122 | } | ||
123 | if (type == SPEAKER) | 119 | if (type == SPEAKER) |
124 | { | 120 | { |
125 | while (1) | 121 | while (1) |
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c index 5ab115c1f..a4a40796f 100644 --- a/src/conversation/microphone.c +++ b/src/conversation/microphone.c | |||
@@ -196,4 +196,5 @@ GNUNET_MICROPHONE_destroy (struct GNUNET_MICROPHONE_Handle *microphone) | |||
196 | GNUNET_free (microphone); | 196 | GNUNET_free (microphone); |
197 | } | 197 | } |
198 | 198 | ||
199 | |||
199 | /* end of microphone.c */ | 200 | /* end of microphone.c */ |
diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c index 9f7299c15..2ea2f48f0 100644 --- a/src/conversation/plugin_gnsrecord_conversation.c +++ b/src/conversation/plugin_gnsrecord_conversation.c | |||
@@ -258,4 +258,5 @@ libgnunet_plugin_gnsrecord_conversation_done (void *cls) | |||
258 | return NULL; | 258 | return NULL; |
259 | } | 259 | } |
260 | 260 | ||
261 | |||
261 | /* end of plugin_gnsrecord_conversation.c */ | 262 | /* end of plugin_gnsrecord_conversation.c */ |
diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c index 8703f269d..38eb1159c 100644 --- a/src/conversation/speaker.c +++ b/src/conversation/speaker.c | |||
@@ -185,4 +185,5 @@ GNUNET_SPEAKER_destroy (struct GNUNET_SPEAKER_Handle *speaker) | |||
185 | GNUNET_free (speaker); | 185 | GNUNET_free (speaker); |
186 | } | 186 | } |
187 | 187 | ||
188 | |||
188 | /* end of speaker.c */ | 189 | /* end of speaker.c */ |
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index 66b800304..2b717367a 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c | |||
@@ -501,4 +501,5 @@ main (int argc, char *argv[]) | |||
501 | return ok; | 501 | return ok; |
502 | } | 502 | } |
503 | 503 | ||
504 | |||
504 | /* end of test_conversation_api.c */ | 505 | /* end of test_conversation_api.c */ |
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c index 53f700890..62e4109b0 100644 --- a/src/conversation/test_conversation_api_reject.c +++ b/src/conversation/test_conversation_api_reject.c | |||
@@ -354,4 +354,5 @@ main (int argc, char *argv[]) | |||
354 | return ok; | 354 | return ok; |
355 | } | 355 | } |
356 | 356 | ||
357 | |||
357 | /* end of test_conversation_api_reject.c */ | 358 | /* end of test_conversation_api_reject.c */ |
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c index 71f97b1d7..fab49f7d7 100644 --- a/src/conversation/test_conversation_api_twocalls.c +++ b/src/conversation/test_conversation_api_twocalls.c | |||
@@ -633,4 +633,5 @@ main (int argc, char *argv[]) | |||
633 | return 1; | 633 | return 1; |
634 | } | 634 | } |
635 | 635 | ||
636 | |||
636 | /* end of test_conversation_api_twocalls.c */ | 637 | /* end of test_conversation_api_twocalls.c */ |