[xiph-commits] r7661 - icecast/branches/kh/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-08-29 15:33:31 -0700 (Sun, 29 Aug 2004)
New Revision: 7661

Modified:
   icecast/branches/kh/icecast/src/admin.c
   icecast/branches/kh/icecast/src/source.c
Log:
minor display changes for xsl pages


Modified: icecast/branches/kh/icecast/src/admin.c
===================================================================
--- icecast/branches/kh/icecast/src/admin.c	2004-08-29 16:56:07 UTC (rev 7660)
+++ icecast/branches/kh/icecast/src/admin.c	2004-08-29 22:33:31 UTC (rev 7661)
@@ -209,6 +209,12 @@
     node = avl_get_first(global.source_tree);
     while(node) {
         source = (source_t *)node->key;
+        if (current_source && strcmp (current_source, source->mount) == 0)
+        {
+            node = avl_get_next(node);
+            continue;
+        }
+
         thread_mutex_lock (&source->lock);
         if (source->running || source->on_demand)
         {
@@ -336,7 +342,7 @@
         }
         else
         {
-            if (source->running == 0)
+            if (source->running == 0 && source->on_demand == 0)
             {
                 INFO2("Received admin command %s on unavailable mount \"%s\"",
                         command_string, mount);

Modified: icecast/branches/kh/icecast/src/source.c
===================================================================
--- icecast/branches/kh/icecast/src/source.c	2004-08-29 16:56:07 UTC (rev 7660)
+++ icecast/branches/kh/icecast/src/source.c	2004-08-29 22:33:31 UTC (rev 7661)
@@ -346,12 +346,12 @@
         long count = 0;
         thread_mutex_lock (&source->lock);
 
-        if (source->format == NULL)
+        if (source->on_demand == 0 && source->format == NULL)
         {
             INFO1 ("source mount %s is not available", source->mount);
             break;
         }
-        if (dest->format)
+        if (source->format && dest->format)
         {
             if (source->format->type != dest->format->type)
             {