From e79a82ba3a5988442426104d97ae0c549d0df62a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 22 Feb 2009 15:24:41 +0100 Subject: 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. --- src/output/shout_plugin.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/output') 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; @@ -378,15 +379,6 @@ open_shout_conn(void *data) return true; } -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) { -- cgit v1.2.3