shout: merged open_shout_conn() into my_shout_open_device()

The method implementation my_shout_open_device() consists of only one line, the call to open_shout_conn(). Merge both functions into one.

shout: merged open_shout_conn() into my_shout_open_device()
e79a82ba · Max Kellermann · cece6c00 · e79a82ba
Commit e79a82ba authored Feb 22, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

shout_plugin.c src/output/shout_plugin.c +2 -10

No files found.
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -357,7 +357,8 @@ shout_connect(struct shout_data *sd)
 }

 static bool
-open_shout_conn(void *data)
+my_shout_open_device(void *data,
+		     G_GNUC_UNUSED struct audio_format *audio_format)
 {
 	struct shout_data *sd = (struct shout_data *)data;
 	bool ret;
@@ -379,15 +380,6 @@ open_shout_conn(void *data)
 }

 static bool
-my_shout_open_device(void *data,
-		     G_GNUC_UNUSED struct audio_format *audio_format)
-{
-	struct shout_data *sd = (struct shout_data *)data;
-
-	return open_shout_conn(sd);
-}
-
-static bool
 my_shout_play(void *data, const char *chunk, size_t size)
 {
 	struct shout_data *sd = (struct shout_data *)data;