From 46daf142fe46b42ab75f0cc37480e74f7efc12e2 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Sun, 18 Dec 2011 21:44:57 +0100
Subject: Rename sink{,_input}_info to sink{,input}

---
 src/command.c     | 10 +++++-----
 src/interface.c   | 10 +++++-----
 src/pa-sink-ctl.c | 16 ++++++++--------
 src/sink.h        |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/command.c b/src/command.c
index ddb0816..425d484 100644
--- a/src/command.c
+++ b/src/command.c
@@ -25,9 +25,9 @@
 #include "command.h"
 
 static int
-sink_input_len(struct context *ctx, struct sink_info *sink)
+sink_input_len(struct context *ctx, struct sink *sink)
 {
-	struct sink_input_info *input;
+	struct sink_input *input;
 	int len = 0;
 
 	list_foreach(ctx->input_list, input)
@@ -41,7 +41,7 @@ static void
 up(struct context *ctx, int key)
 {
 	struct interface *ifc = &ctx->interface;
-	struct sink_info *sink = NULL;
+	struct sink *sink = NULL;
 
 	if (!ctx->context_ready)
 		return;
@@ -61,7 +61,7 @@ static void
 down(struct context *ctx, int key)
 {
 	struct interface *ifc = &ctx->interface;
-	struct sink_info *sink;
+	struct sink *sink;
 
 	if (!ctx->context_ready)
 		return;
@@ -143,7 +143,7 @@ static void
 switch_sink(struct context *ctx, int key)
 {
 	struct interface *ifc = &ctx->interface;
-	struct sink_input_info *t;
+	struct sink_input *t;
 	struct vol_ctl *input, *sink;
 	pa_operation *o;
 	gint i;
diff --git a/src/interface.c b/src/interface.c
index d6fa085..ddd1bb6 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -38,10 +38,10 @@
 #include "unix_signal.h"
 #endif
 
-static struct sink_input_info *
-sink_get_nth_input(struct context *ctx, struct sink_info *sink, int n)
+static struct sink_input *
+sink_get_nth_input(struct context *ctx, struct sink *sink, int n)
 {
-	struct sink_input_info *input;
+	struct sink_input *input;
 	int i = 0;
 
 	list_foreach(ctx->input_list, input) {
@@ -58,8 +58,8 @@ struct vol_ctl *
 interface_get_current_ctl(struct interface *ifc, struct vol_ctl **parent)
 {
 	struct context *ctx = container_of(ifc, struct context, interface);
-	struct sink_info *sink;
-	struct sink_input_info *input;
+	struct sink *sink;
+	struct sink_input *input;
 
 	if (parent)
 		*parent = NULL;
diff --git a/src/pa-sink-ctl.c b/src/pa-sink-ctl.c
index d1b9954..7537e60 100644
--- a/src/pa-sink-ctl.c
+++ b/src/pa-sink-ctl.c
@@ -64,8 +64,8 @@ get_sink_name(struct context *ctx, const pa_sink_info *sink)
 static gint
 compare_sink_priority(gconstpointer new_data, gconstpointer el_data)
 {
-	const struct sink_info *new = new_data;
-	const struct sink_info *el = el_data;
+	const struct sink *new = new_data;
+	const struct sink *el = el_data;
 
 	/* Add 1 to append at end of sinks if priority equals */
 	return el->priority - new->priority + 1;
@@ -74,8 +74,8 @@ compare_sink_priority(gconstpointer new_data, gconstpointer el_data)
 static void
 sink_childs_foreach(struct vol_ctl *ctl, GFunc func, gpointer user_data)
 {
-	struct sink_info *sink = (struct sink_info *) ctl;
-	struct sink_input_info *input;
+	struct sink *sink = (struct sink *) ctl;
+	struct sink_input *input;
 
 	list_foreach(sink->ctx->input_list, input)
 		if (input->sink == sink->base.index)
@@ -87,7 +87,7 @@ sink_info_cb(pa_context *c, const pa_sink_info *i,
 	     gint is_last, gpointer userdata)
 {
 	struct context *ctx = userdata;
-	struct sink_info *sink;
+	struct sink *sink;
 	GList *el;
 
 	if (is_last < 0) {
@@ -106,7 +106,7 @@ sink_info_cb(pa_context *c, const pa_sink_info *i,
 
 	el = g_list_find_custom(ctx->sink_list, &i->index, compare_idx_pntr);
 	if (el == NULL) {
-		sink = g_new0(struct sink_info, 1);
+		sink = g_new0(struct sink, 1);
 		if (sink == NULL)
 			return;
 		sink->base.index = i->index;
@@ -134,7 +134,7 @@ sink_input_info_cb(pa_context *c, const pa_sink_input_info *i,
 		   gint is_last, gpointer userdata)
 {
 	struct context *ctx = userdata;
-	struct sink_input_info *sink_input;
+	struct sink_input *sink_input;
 	GList *el;
 
 	if (is_last < 0) {
@@ -155,7 +155,7 @@ sink_input_info_cb(pa_context *c, const pa_sink_input_info *i,
 
 	el = g_list_find_custom(ctx->input_list, &i->index, compare_idx_pntr);
 	if (el == NULL) {
-		sink_input = g_new0(struct sink_input_info, 1);
+		sink_input = g_new0(struct sink_input, 1);
 		if (sink_input == NULL)
 			return;
 		sink_input->base.index = i->index;
diff --git a/src/sink.h b/src/sink.h
index 04b4afa..3a21f6d 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -44,13 +44,13 @@ struct vol_ctl {
 	void (*childs_foreach)(struct vol_ctl *ctx, GFunc func, gpointer udata);
 };
 
-struct sink_info {
+struct sink {
 	struct vol_ctl base;
 	gint priority;
 	struct context *ctx;
 };
 
-struct sink_input_info {
+struct sink_input {
 	struct vol_ctl base;
 	guint32 sink;
 };
-- 
cgit