rpms/audacious-plugins/F-12 audacious-plugins-2.1-icecast.patch, 1.1, 1.2 audacious-plugins.spec, 1.67, 1.68

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29934

Modified Files:
	audacious-plugins-2.1-icecast.patch audacious-plugins.spec 
Log Message:
* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-21
- Avoid crash in unconfigured icecast effects plugin.
- Fix non-top-level icecast plugin dialog.
- Fix non-top-level sndstretch plugin dialog.


audacious-plugins-2.1-icecast.patch:
 icecast.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: audacious-plugins-2.1-icecast.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins-2.1-icecast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.1-icecast.patch	21 Nov 2009 20:14:44 -0000	1.1
+++ audacious-plugins-2.1-icecast.patch	21 Nov 2009 21:13:08 -0000	1.2
@@ -1,7 +1,41 @@
 diff -Nur audacious-plugins-fedora-2.1-orig/src/icecast/icecast.c audacious-plugins-fedora-2.1-icecast/src/icecast/icecast.c
 --- audacious-plugins-fedora-2.1-orig/src/icecast/icecast.c	2009-07-07 00:40:36.000000000 +0200
-+++ audacious-plugins-fedora-2.1-icecast/src/icecast/icecast.c	2009-11-21 21:10:32.267815839 +0100
-@@ -609,6 +609,7 @@
++++ audacious-plugins-fedora-2.1-icecast/src/icecast/icecast.c	2009-11-21 22:10:03.314818476 +0100
+@@ -87,6 +87,7 @@
+ static gchar *stream_description = NULL;
+ 
+ static gboolean ep_playing = FALSE;
++static gboolean init_end = FALSE;
+ 
+ VFSFile *output_file = NULL;
+ guint64 written = 0;
+@@ -251,6 +252,7 @@
+ 
+     if (ep_playing == TRUE)
+         return 0;
++    init_end = FALSE;
+ 
+     if (buffersize != buffersize_new)
+     {
+@@ -379,6 +381,7 @@
+         }
+     }
+ 
++    init_end = TRUE;
+     convert_init(fmt, plugin->format_required, nch);
+ 
+     rv = (plugin->open)();
+@@ -399,6 +402,9 @@
+ {
+     if (ice_tid)
+         g_source_remove(ice_tid);
++    if (!init_end) {
++        return length;
++    }
+ 
+     if (!shout)
+     {
+@@ -609,6 +615,7 @@
          plugin_new = plugin;
  
          configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- audacious-plugins.spec	21 Nov 2009 20:14:44 -0000	1.67
+++ audacious-plugins.spec	21 Nov 2009 21:13:08 -0000	1.68
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -257,7 +257,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-20
+* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-21
+- Avoid crash in unconfigured icecast effects plugin.
 - Fix non-top-level icecast plugin dialog.
 - Fix non-top-level sndstretch plugin dialog.