[xiph-commits] r8134 - in icecast/branches/kh/icecast: admin doc web
karl at motherfish-iii.xiph.org
karl at motherfish-iii.xiph.org
Fri Oct 29 10:26:51 PDT 2004
Author: karl
Date: 2004-10-29 10:26:50 -0700 (Fri, 29 Oct 2004)
New Revision: 8134
Modified:
icecast/branches/kh/icecast/admin/listclients.xsl
icecast/branches/kh/icecast/admin/listmounts.xsl
icecast/branches/kh/icecast/admin/manageauth.xsl
icecast/branches/kh/icecast/admin/moveclients.xsl
icecast/branches/kh/icecast/admin/response.xsl
icecast/branches/kh/icecast/admin/stats.xsl
icecast/branches/kh/icecast/doc/Makefile.am
icecast/branches/kh/icecast/doc/icecast2_admin.html
icecast/branches/kh/icecast/doc/icecast2_config_file.html
icecast/branches/kh/icecast/web/Makefile.am
icecast/branches/kh/icecast/web/status.xsl
Log:
more resync work, this time on docs and the xsl files
Modified: icecast/branches/kh/icecast/admin/listclients.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/listclients.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/admin/listclients.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>List Connected Listeners</h2>
<div class="roundcont">
<div class="roundtop">
@@ -58,19 +54,14 @@
</tr>
</xsl:for-each>
</table>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:for-each>
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/branches/kh/icecast/admin/listmounts.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/listmounts.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/admin/listmounts.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>List Mountpoints</h2>
<div class="roundcont">
<div class="roundtop">
@@ -43,7 +39,7 @@
<xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
</td></tr>
</table>
-<br></br>
+<br />
<p><xsl:value-of select="listeners" /> Listener(s)</p>
<br></br>
</xsl:for-each>
@@ -52,11 +48,6 @@
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/branches/kh/icecast/admin/manageauth.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/manageauth.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/admin/manageauth.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>Show defined users</h2>
<div class="roundcont">
<div class="roundtop">
@@ -70,19 +66,14 @@
<input type="hidden" name="mount" value="{@mount}"/>
<input type="hidden" name="action" value="add"/>
</form>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:for-each>
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/branches/kh/icecast/admin/moveclients.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/moveclients.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/admin/moveclients.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -1,13 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
-
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -19,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
<h2>Move Clients from (<xsl:value-of select="current_source" />)</h2>
<div class="roundcont">
@@ -39,19 +34,14 @@
<td><a class="nav2" href="moveclients.xsl?mount={$currentmount}&destination={@mount}">Move Clients</a></td>
</tr>
</table>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:for-each>
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/branches/kh/icecast/admin/response.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/response.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/admin/response.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/iceresponse" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>Icecast Server Response</h2>
<div class="roundcont">
<div class="roundtop">
@@ -33,18 +29,13 @@
Message : <xsl:value-of select="message" /><br></br>
Return Code: <xsl:value-of select="return" /><br></br>
</xsl:for-each>
-<br></br>
-<br></br>
+<br />
+<br />
</div>
<div class="roundbottom">
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/branches/kh/icecast/admin/stats.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/stats.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/admin/stats.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -1,12 +1,12 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output method="html" indent="yes" />
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:template match = "/icestats" >
<html>
<head>
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body bgcolor="black">
+<body>
<center>
<table border="0" cellpadding="1" cellspacing="3">
<tr>
@@ -18,10 +18,6 @@
</td></tr>
</table>
</center>
-<table border="0" width="90%%">
-<tr>
-<td width="50"></td>
-<td>
<h2>Icecast Status Page</h2>
<div class="roundcont">
<div class="roundtop">
@@ -46,8 +42,8 @@
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br>
-<br></br>
+<br />
+<br />
<div class="roundcont">
<div class="roundtop">
@@ -70,7 +66,7 @@
<xsl:if test="authenticator"> | <a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
</td></tr>
</table>
-<br></br>
+<br />
<table cellpadding="5" cellspacing="0" border="0">
<xsl:for-each select="*">
<tr>
@@ -79,8 +75,8 @@
</tr>
</xsl:for-each>
</table>
-<br></br>
-<br></br>
+<br />
+<br />
</xsl:if>
</xsl:for-each>
</div>
@@ -88,11 +84,6 @@
<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
</div>
</div>
-<br></br><br></br>
-</td>
-<td width="50"></td>
-</tr>
-</table>
<div class="poster">
<img align="left" src="/icecast.png" />Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
</body>
Modified: icecast/branches/kh/icecast/doc/Makefile.am
===================================================================
--- icecast/branches/kh/icecast/doc/Makefile.am 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/doc/Makefile.am 2004-10-29 17:26:50 UTC (rev 8134)
@@ -6,8 +6,8 @@
doc_DATA = index.html icecast2_admin.html icecast2_basicsetup.html \
icecast2_config_file.html icecast2_faq.html icecast2_glossary.html \
icecast2_introduction.html icecast2_relay.html icecast2_stats.html \
- icecast2_win32.html icecast2_yp.html
+ icecast2_win32.html icecast2_yp.html icecast2_listenerauth.html
-EXTRA_DIST = Index.hhk icecast2.chm icecast2.hhc icecast2.hhp index_win32.html \
+EXTRA_DIST = Index.hhk icecast2.hhc icecast2.hhp index_win32.html \
stats1.jpg style.css win32_section1.html win32_section2.html \
win32_section3.html windowtitle.jpg $(doc_DATA)
Modified: icecast/branches/kh/icecast/doc/icecast2_admin.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_admin.html 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/doc/icecast2_admin.html 2004-10-29 17:26:50 UTC (rev 8134)
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<title>Icecast v2.0 Documentation</title>
+<title>Icecast v2.x Documentation</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
@@ -14,7 +14,7 @@
<br />
<h2>Overview</h2>
<p>This section contains information about the admin interface of icecast. Through this interface the user can manipulate many server features. From it you can gather statistics, mov e listeners from mountpoint to mountpoint, disconnect connected sources, disconnect connected listeners, and many other activities. Each function is enumerated here as well as an example usage of the function.</p>
-<p>Each of these functions requires authentication via the <admin-username> and <admin-password> specified in the icecast config file. It is also important to note that in all the examples 192.168.1.10 is used as the example host and 8000 is used as the example port for the icecast server.</p>
+<p>Each of these functions requires HTTP authentication via the appropriate username and password. For mount-specific functions, you may use either the <admin-username> and <admin-password> specified in the icecast config file, or the username and password specified for that mountpoint (if any). For general functions (not specific to a single mountpoint), you must use the admin username and password. It is also important to note that in all the examples 192.168.1.10 is used as the example host and 8000 is used as the example port for the icecast server.</p>
<br />
<br />
<br />
Modified: icecast/branches/kh/icecast/doc/icecast2_config_file.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_config_file.html 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/doc/icecast2_config_file.html 2004-10-29 17:26:50 UTC (rev 8134)
@@ -191,8 +191,8 @@
<relay>
<server>127.0.0.1</server>
<port>8001</port>
- <mount>example.ogg</mount>
- <local-mount>different.ogg</local-mount>
+ <mount>/example.ogg</mount>
+ <local-mount>/different.ogg</local-mount>
<relay-shoutcast-metadata>0</relay-shoutcast-metadata>
<on-demand>0</on-demand>
</relay>
@@ -282,8 +282,8 @@
<relay>
<server>127.0.0.1</server>
<port>8001</port>
- <mount>example.ogg</mount>
- <local-mount>different.ogg</local-mount>
+ <mount>/example.ogg</mount>
+ <local-mount>/different.ogg</local-mount>
<relay-shoutcast-metadata>0</relay-shoutcast-metadata>
<on-demand>1</on-demand>
</relay>
@@ -330,7 +330,7 @@
<password>hackmemore</password>
<max-listeners>1</max-listeners>
<dump-file>/tmp/dump-example1.ogg</dump-file>
- <fallback-mount>example2.ogg</fallback-mount>
+ <fallback-mount>/example2.ogg</fallback-mount>
<fallback-override>1</fallback-override>
<burst-size>65536</burst-size>
<mp3-metadata-interval>8192</mp3-metadata-interval>
@@ -365,7 +365,15 @@
</div>
<h4>fallback-mount</h4>
<div class="indentedbox">
-This specifies a mountpoint that is used in the case of a source disconnect. If listeners are connected to the mount specified by the <mount-name> config value, then if the source is disconnected; all currently connected clients will be moved to the fallback-mount.
+This optional value specifies a mountpoint that clients are automatically moved to if the source
+shuts down or is not streaming at the time a listener connects. Only one can be listed in each
+mount and should refer to another mountpoint on the same server that is streaming in the same
+streaming format.<br>
+If clients cannot fallback to another mountpoint, due to a missing fallback-mount or it states a
+mountpoint that is just not available, then those clients will be disconnected.
+If clients are falling back to a mountpoint and the fallback-mount is not actively streaming
+but defines a fallback-mount itself then those clients may be moved there instead.
+This multi-level fallback allows clients to cascade several mountpoints.
</div>
<h4>fallback-override</h4>
<div class="indentedbox">
Modified: icecast/branches/kh/icecast/web/Makefile.am
===================================================================
--- icecast/branches/kh/icecast/web/Makefile.am 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/web/Makefile.am 2004-10-29 17:26:50 UTC (rev 8134)
@@ -11,4 +11,5 @@
corner_topright.jpg \
icecast.png \
key.gif \
- style.css
+ style.css \
+ auth.xsl
Modified: icecast/branches/kh/icecast/web/status.xsl
===================================================================
--- icecast/branches/kh/icecast/web/status.xsl 2004-10-29 17:19:03 UTC (rev 8133)
+++ icecast/branches/kh/icecast/web/status.xsl 2004-10-29 17:26:50 UTC (rev 8134)
@@ -34,6 +34,9 @@
<xsl:if test="bitrate">
<tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr>
</xsl:if>
+<xsl:if test="quality">
+<tr><td>Quality:</td><td class="streamdata"> <xsl:value-of select="quality" /></td></tr>
+</xsl:if>
<xsl:if test="listeners">
<tr><td>Stream Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
</xsl:if>
More information about the commits
mailing list