changeset 2830:b17cffd47053

fix time display and playback; don't know why, but playing=0 makes it happy
author Andrew O. Shadoura <bugzilla@tut.by>
date Mon, 14 Jul 2008 00:27:39 +0300
parents ae797b0c21fa
children 8f28fccf2bdd
files src/filewriter/mp3.c src/icecast/icecast.c
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/filewriter/mp3.c	Sun Jul 13 23:28:55 2008 +0300
+++ b/src/filewriter/mp3.c	Mon Jul 14 00:27:39 2008 +0300
@@ -203,6 +203,8 @@
 
 static gint mp3_open(void)
 {
+    olen = 0;
+
     gfp = lame_init();
     if (gfp == NULL)
         return 0;
--- a/src/icecast/icecast.c	Sun Jul 13 23:28:55 2008 +0300
+++ b/src/icecast/icecast.c	Mon Jul 14 00:27:39 2008 +0300
@@ -260,10 +260,10 @@
 
     plugin = plugin_new;
 
+    rv = (plugin.open)();
+
     if (!shout)
     {
-        rv = (plugin.open)();
-
         if (!(shout = shout_new()))
             return 0;
 
@@ -315,9 +315,6 @@
             return 0;
         }
     }
-    else
-        rv = 1;
-
     {
         shout_metadata_t *sm = NULL;
         sm = shout_metadata_new();
@@ -489,7 +486,7 @@
 
 static gint ice_playing(void)
 {
-    return !paused;
+    return 0 && !paused;
 }
 
 static gint ice_get_written_time(void)