diff options
Diffstat (limited to 'src/conversation/gnunet_gst_def.h')
-rw-r--r-- | src/conversation/gnunet_gst_def.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h index 5f5910121..bbadc5f92 100644 --- a/src/conversation/gnunet_gst_def.h +++ b/src/conversation/gnunet_gst_def.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "platform.h" | 36 | #include "platform.h" |
37 | #include "gnunet_util_lib.h" | 37 | #include "gnunet_util_lib.h" |
38 | #include "gnunet_protocols.h" | 38 | #include "gnunet_protocols.h" |
39 | //#include "gnunet/conversation.h" doesn't get installed | 39 | // #include "gnunet/conversation.h" doesn't get installed |
40 | #include "conversation.h" | 40 | #include "conversation.h" |
41 | #include "gnunet_constants.h" | 41 | #include "gnunet_constants.h" |
42 | #include "gnunet_core_service.h" | 42 | #include "gnunet_core_service.h" |
@@ -76,18 +76,19 @@ | |||
76 | #include <fcntl.h> | 76 | #include <fcntl.h> |
77 | 77 | ||
78 | 78 | ||
79 | //glib stuff | 79 | // glib stuff |
80 | //#include <glib.h> | 80 | // #include <glib.h> |
81 | #include <glib-2.0/glib/gprintf.h> | 81 | #include <glib-2.0/glib/gprintf.h> |
82 | //#include <glib-unix.h> | 82 | // #include <glib-unix.h> |
83 | 83 | ||
84 | // static struct AudioMessage *audio_message; | 84 | // static struct AudioMessage *audio_message; |
85 | 85 | ||
86 | 86 | ||
87 | 87 | ||
88 | typedef struct GNUNET_gstData GNUNET_gstData; | 88 | typedef struct GNUNET_gstData GNUNET_gstData; |
89 | struct GNUNET_gstData { | 89 | struct GNUNET_gstData |
90 | //general | 90 | { |
91 | // general | ||
91 | GstPipeline *pipeline; | 92 | GstPipeline *pipeline; |
92 | 93 | ||
93 | // things | 94 | // things |
@@ -95,7 +96,7 @@ struct GNUNET_gstData { | |||
95 | struct GNUNET_MessageStreamTokenizer *stdin_mst; | 96 | struct GNUNET_MessageStreamTokenizer *stdin_mst; |
96 | GstElement *appsrc; | 97 | GstElement *appsrc; |
97 | GstElement *appsink; | 98 | GstElement *appsink; |
98 | //settings | 99 | // settings |
99 | int audiobackend; | 100 | int audiobackend; |
100 | int dropsilence; | 101 | int dropsilence; |
101 | int usertp; | 102 | int usertp; |
@@ -187,7 +188,8 @@ struct GNUNET_gstData { | |||
187 | 188 | ||
188 | #define SAMPLING_RATE 48000 | 189 | #define SAMPLING_RATE 48000 |
189 | 190 | ||
190 | enum { | 191 | enum |
192 | { | ||
191 | AUTO, | 193 | AUTO, |
192 | JACK, | 194 | JACK, |
193 | ALSA, | 195 | ALSA, |
@@ -195,22 +197,26 @@ enum { | |||
195 | TEST | 197 | TEST |
196 | }; | 198 | }; |
197 | 199 | ||
198 | enum { | 200 | enum |
201 | { | ||
199 | SOURCE, | 202 | SOURCE, |
200 | SINK | 203 | SINK |
201 | }; | 204 | }; |
202 | 205 | ||
203 | enum { | 206 | enum |
207 | { | ||
204 | ENCODER, | 208 | ENCODER, |
205 | DECODER | 209 | DECODER |
206 | }; | 210 | }; |
207 | 211 | ||
208 | enum { | 212 | enum |
213 | { | ||
209 | FAIL, | 214 | FAIL, |
210 | OK | 215 | OK |
211 | }; | 216 | }; |
212 | 217 | ||
213 | enum { | 218 | enum |
219 | { | ||
214 | SPEAKER, | 220 | SPEAKER, |
215 | MICROPHONE | 221 | MICROPHONE |
216 | }; | 222 | }; |