summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-09-23 14:19:47 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-09-23 14:34:36 +0200
commitcfde4eb9113d779b4b43c7a056691fd3e307f2c2 (patch)
tree71e5a13d7afe74d4ba539a7663a7adda529f8073 /src
parent432cbe7f0a803e0b653e651872862c8ca4152af2 (diff)
downloadcmumble-cfde4eb9113d779b4b43c7a056691fd3e307f2c2.tar.gz
cmumble-cfde4eb9113d779b4b43c7a056691fd3e307f2c2.tar.bz2
cmumble-cfde4eb9113d779b4b43c7a056691fd3e307f2c2.zip
Fix indents
Diffstat (limited to 'src')
-rw-r--r--src/audio.c14
-rw-r--r--src/cmumble.c2
-rw-r--r--src/io.c6
-rw-r--r--src/message.c6
4 files changed, 14 insertions, 14 deletions
diff --git a/src/audio.c b/src/audio.c
index 519dc04..c364b4f 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -11,7 +11,7 @@ cmumble_audio_push(struct context *ctx, struct user *user,
const uint8_t *data, gsize size)
{
GstBuffer *gstbuf;
-
+
gstbuf = gst_app_buffer_new(g_memdup(data, size), size, g_free, NULL);
gst_app_src_push_buffer(user->src, gstbuf);
}
@@ -64,8 +64,8 @@ setup_recording_gst_pipeline(struct context *ctx)
GstCaps *caps;
char *desc = "autoaudiosrc ! cutter name=cutter ! audioresample ! audioconvert ! "
- "audio/x-raw-int,channels=1,depth=16,rate=48000,signed=TRUE,width=16 ! "
- "celtenc ! appsink name=sink";
+ "audio/x-raw-int,channels=1,depth=16,rate=48000,signed=TRUE,width=16 ! "
+ "celtenc ! appsink name=sink";
pipeline = gst_parse_launch(desc, &error);
if (error) {
@@ -79,11 +79,11 @@ setup_recording_gst_pipeline(struct context *ctx)
cutter = gst_bin_get_by_name(GST_BIN(pipeline), "cutter");
g_object_set(G_OBJECT(cutter),
"threshold_dB", -45.0, "leaky", TRUE, NULL);
-
+
gst_app_sink_set_emit_signals(ctx->audio.sink, TRUE);
gst_app_sink_set_drop(ctx->audio.sink, FALSE);;
g_signal_connect(sink, "new-buffer", G_CALLBACK(pull_buffer), ctx);
-
+
caps = gst_caps_new_simple("audio/x-celt",
"rate", G_TYPE_INT, SAMPLERATE,
"channels", G_TYPE_INT, 1,
@@ -124,7 +124,7 @@ set_pulse_states(gpointer data, gpointer user_data)
"application.name", G_TYPE_STRING, name,
"media.role", G_TYPE_STRING, "phone",
NULL);
-
+
g_object_set(elm, "stream-properties", props, NULL);
gst_structure_free(props);
g_free(name);
@@ -176,7 +176,7 @@ static int
setup_playback_gst_pipeline(struct context *ctx)
{
ctx->audio.celt_mode = celt_mode_create(SAMPLERATE,
- SAMPLERATE / 100, NULL);
+ SAMPLERATE / 100, NULL);
celt_header_init(&ctx->audio.celt_header, ctx->audio.celt_mode, CHANNELS);
celt_header_to_packet(&ctx->audio.celt_header,
ctx->audio.celt_header_packet, sizeof(CELTHeader));
diff --git a/src/cmumble.c b/src/cmumble.c
index 3d060ce..33ba9d4 100644
--- a/src/cmumble.c
+++ b/src/cmumble.c
@@ -47,7 +47,7 @@ recv_udp_tunnel(MumbleProto__UDPTunnel *tunnel, struct context *ctx)
frame_len = data[pos] & 0x7F;
terminator = data[pos] & 0x80;
pos += 1;
-
+
if (frame_len == 0 || frame_len > len-pos)
break;
diff --git a/src/io.c b/src/io.c
index 8d01a8e..ff7db5a 100644
--- a/src/io.c
+++ b/src/io.c
@@ -68,7 +68,7 @@ process_line(char *line)
struct context *ctx = global_rl_user_data;
g_assert(global_rl_user_data);
-
+
rl_reset_line_state();
if (line == NULL) {
@@ -96,9 +96,9 @@ int
cmumble_io_init(struct context *ctx)
{
struct termios term;
-
+
ctx->io.input_channel = g_io_channel_unix_new(STDIN_FILENO);
-
+
g_io_add_watch(ctx->io.input_channel, G_IO_IN | G_IO_HUP,
read_cb, ctx);
diff --git a/src/message.c b/src/message.c
index 61e2589..5ed6f14 100644
--- a/src/message.c
+++ b/src/message.c
@@ -46,7 +46,7 @@ cmumble_send_msg(struct context *ctx, ProtobufCMessage *msg)
int type = -1;
int i;
ProtobufCBufferSimple buffer = PROTOBUF_C_BUFFER_SIMPLE_INIT(pad);
-
+
for (i = 0; i < G_N_ELEMENTS(messages); ++i)
if (messages[i].descriptor == msg->descriptor)
type = i;
@@ -93,7 +93,7 @@ cmumble_recv_msg(struct context *ctx)
g_printerr("read failed: %ld\n", ret);
return 0;
}
-
+
get_preamble(preamble, &type, &len);
if (!(type >= 0 && type < G_N_ELEMENTS(messages))) {
@@ -122,7 +122,7 @@ cmumble_recv_msg(struct context *ctx)
udptunnel.packet.len = len;
udptunnel.packet.data = (uint8_t *) data;
-
+
if (ctx->callbacks[UDPTunnel])
ctx->callbacks[UDPTunnel](&udptunnel.base, ctx);