aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-22 15:24:41 +0100
committerMax Kellermann <max@duempel.org>2009-02-22 15:24:41 +0100
commite79a82ba3a5988442426104d97ae0c549d0df62a (patch)
tree78042eedb62e3438a73eff5696ac2cbc1eeafc48
parentcece6c00f4b80e651b2ad11425190005e5711cd3 (diff)
downloadmpd-e79a82ba3a5988442426104d97ae0c549d0df62a.tar.gz
mpd-e79a82ba3a5988442426104d97ae0c549d0df62a.tar.xz
mpd-e79a82ba3a5988442426104d97ae0c549d0df62a.zip
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.
-rw-r--r--src/output/shout_plugin.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index eb05d4f06..f03d80231 100644
--- 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;