changeset 3046:75cd491339c9

ported icecast plugin, fixed possibly uninitialized variable in cue plugin
author Andrew O. Shadoura <bugzilla@tut.by>
date Fri, 17 Apr 2009 16:11:16 +0300
parents 85f036d3e641
children 4434b4c4a715
files src/cue/cuesheet.c src/icecast/icecast.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/cue/cuesheet.c	Thu Apr 16 16:53:42 2009 -0500
+++ b/src/cue/cuesheet.c	Fri Apr 17 16:11:16 2009 +0300
@@ -187,7 +187,7 @@
 Tuple *
 get_song_tuple(gchar *uri) /* *.cue or *.cue?1- */
 {
-    Tuple *phys_tuple, *out;
+    Tuple *phys_tuple = NULL, *out;
     ProbeResult *pr = NULL;
     InputPlugin *dec = NULL;
     gint track = 0;
--- a/src/icecast/icecast.c	Thu Apr 16 16:53:42 2009 -0500
+++ b/src/icecast/icecast.c	Fri Apr 17 16:11:16 2009 +0300
@@ -95,7 +95,7 @@
 static shout_t *shout = NULL;
 static gboolean paused = FALSE;
 
-static void ice_init(void);
+static OutputPluginInitStatus ice_init(void);
 static void ice_cleanup(void);
 static void ice_about(void);
 static gint ice_open(AFormat fmt, gint rate, gint nch);
@@ -115,6 +115,7 @@
 OutputPlugin ice_op =
 {
     .description = "Icecast Plugin (output)",
+    .probe_priority = 0,
     .init = ice_init,
     .cleanup = ice_cleanup,
     .about = ice_about,
@@ -161,7 +162,7 @@
 #endif
 }
 
-static void ice_init(void)
+static OutputPluginInitStatus ice_init(void)
 {
     ConfigDb *db;
     shout_init();
@@ -201,6 +202,8 @@
     plugin = plugin_new;
     if (plugin.init)
         plugin.init(&ice_write_output);
+
+    return OUTPUT_PLUGIN_INIT_NO_DEVICES;
 }
 
 static void ice_cleanup(void)