diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-01 12:30:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-01 12:30:55 +0000 |
commit | 2b8aa2e755da70f7e52ae99ed9dfcf8d94cd75d4 (patch) | |
tree | 1c10a679ecc58e1071edf814ea4bb65f20a221fd /src/conversation/gnunet-helper-audio-playback.c | |
parent | 9adf180a551d2e4c4cc9bb0932a9f3990b8a1704 (diff) | |
download | gnunet-2b8aa2e755da70f7e52ae99ed9dfcf8d94cd75d4.tar.gz gnunet-2b8aa2e755da70f7e52ae99ed9dfcf8d94cd75d4.zip |
-fixing last FTBFS issues
Diffstat (limited to 'src/conversation/gnunet-helper-audio-playback.c')
-rw-r--r-- | src/conversation/gnunet-helper-audio-playback.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 6e8ca86ff..7a1cd4860 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -31,67 +31,67 @@ static pa_sample_spec sample_spec = { | |||
31 | /** | 31 | /** |
32 | * Pulseaudio mainloop api | 32 | * Pulseaudio mainloop api |
33 | */ | 33 | */ |
34 | static pa_mainloop_api *mainloop_api = NULL; | 34 | static pa_mainloop_api *mainloop_api; |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * Pulseaudio threaded mainloop | 37 | * Pulseaudio threaded mainloop |
38 | */ | 38 | */ |
39 | static pa_threaded_mainloop *m = NULL; | 39 | static pa_threaded_mainloop *m; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * Pulseaudio context | 42 | * Pulseaudio context |
43 | */ | 43 | */ |
44 | static pa_context *context = NULL; | 44 | static pa_context *context; |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * Pulseaudio output stream | 47 | * Pulseaudio output stream |
48 | */ | 48 | */ |
49 | static pa_stream *stream_out = NULL; | 49 | static pa_stream *stream_out; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Pulseaudio io events | 52 | * Pulseaudio io events |
53 | */ | 53 | */ |
54 | static pa_io_event *stdio_event = NULL; | 54 | static pa_io_event *stdio_event; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * OPUS decoder | 57 | * OPUS decoder |
58 | */ | 58 | */ |
59 | OpusDecoder *dec = NULL; | 59 | static OpusDecoder *dec; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * PCM data buffer | 62 | * PCM data buffer |
63 | */ | 63 | */ |
64 | float *pcm_buffer; | 64 | static float *pcm_buffer; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * Length of PCM buffer | 67 | * Length of PCM buffer |
68 | */ | 68 | */ |
69 | int pcm_length; | 69 | static int pcm_length; |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * Number of samples for one frame | 72 | * Number of samples for one frame |
73 | */ | 73 | */ |
74 | int frame_size; | 74 | static int frame_size; |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * The sampling rate used in Pulseaudio specification | 77 | * The sampling rate used in Pulseaudio specification |
78 | */ | 78 | */ |
79 | opus_int32 sampling_rate; | 79 | static opus_int32 sampling_rate; |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * Audio buffer | 82 | * Audio buffer |
83 | */ | 83 | */ |
84 | static void *buffer = NULL; | 84 | static void *buffer; |
85 | 85 | ||
86 | /** | 86 | /** |
87 | * Length of audio buffer | 87 | * Length of audio buffer |
88 | */ | 88 | */ |
89 | static size_t buffer_length = 0; | 89 | static size_t buffer_length; |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * Read index for transmit buffer | 92 | * Read index for transmit buffer |
93 | */ | 93 | */ |
94 | static size_t buffer_index = 0; | 94 | static size_t buffer_index; |
95 | 95 | ||
96 | 96 | ||
97 | 97 | ||
@@ -386,6 +386,7 @@ main (int argc, char *argv[]) | |||
386 | 386 | ||
387 | mst_receive (stdin_mst, readbuf, ret); | 387 | mst_receive (stdin_mst, readbuf, ret); |
388 | } | 388 | } |
389 | mst_destroy (stdin_mst); | ||
389 | 390 | ||
390 | return 0; | 391 | return 0; |
391 | } | 392 | } |