Update of /cvsroot/freevo/freevo/WIP/Wigren/Webradio
In directory sc8-pr-cvs1:/tmp/cvs-serv26729
Modified Files:
stations.dtd stations.fxd
Added Files:
check.sh
Log Message:
XML and DTD are 100% valid now.
--- NEW FILE: check.sh ---
#!/bin/sh
FILE=$1
xmllint --loaddtd --valid --noout $FILE && echo $FILE is correct!
Index: stations.dtd
===================================================================
RCS file: /cvsroot/freevo/freevo/WIP/Wigren/Webradio/stations.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stations.dtd 7 Oct 2003 05:38:41 -0000 1.1
--- stations.dtd 7 Oct 2003 06:13:22 -0000 1.2
***************
*** 13,18 ****
type CDATA #IMPLIED >
! <!-- module -->
! <!ELEMENT module (param+) >
<!ATTLIST module
name CDATA #REQUIRED >
--- 13,18 ----
type CDATA #IMPLIED >
! <!-- module : module used to get info from this channel -->
! <!ELEMENT module (param*) >
<!ATTLIST module
name CDATA #REQUIRED >
***************
*** 24,41 ****
<!-- info -->
! <!ELEMENT info (desc*, genre*, lang?, homepage?, location?) >
! <!-- desc -->
<!ELEMENT desc (#PCDATA) >
<!ATTLIST desc
lang CDATA #REQUIRED >
! <!-- genre -->
<!ELEMENT genre (#PCDATA) >
! <!-- homepage -->
<!ELEMENT homepage (#PCDATA) >
! <!-- location -->
<!ELEMENT location (#PCDATA) >
--- 24,44 ----
<!-- info -->
! <!ELEMENT info (desc*, genre*, lang*, homepage?, location?) >
! <!-- desc : Short description for channel -->
<!ELEMENT desc (#PCDATA) >
<!ATTLIST desc
lang CDATA #REQUIRED >
! <!-- genre -->
<!ELEMENT genre (#PCDATA) >
! <!-- lang : language(s) used for speech on this station -->
! <!ELEMENT lang (#PCDATA) >
!
! <!-- homepage : Homepage for channel -->
<!ELEMENT homepage (#PCDATA) >
! <!-- location : Country where stations is located physically -->
<!ELEMENT location (#PCDATA) >
***************
*** 46,67 ****
<!ELEMENT stream (url) >
<!ATTLIST stream
! codec (MP3|WMA) #REQUIRED
kbps CDATA #IMPLIED
br CDATA #IMPLIED
ch CDATA #IMPLIED >
! <!-- url -->
<!ELEMENT url (include?, exclude?, start?) >
<!ATTLIST url
! type (media | asx | m3u | pls) #REQUIRED
href CDATA #REQUIRED >
! <!-- include -->
<!ELEMENT include (#PCDATA) >
! <!-- exclude -->
<!ELEMENT exclude (#PCDATA) >
! <!-- start -->
<!ELEMENT start (#PCDATA) >
--- 49,70 ----
<!ELEMENT stream (url) >
<!ATTLIST stream
! codec CDATA #REQUIRED
kbps CDATA #IMPLIED
br CDATA #IMPLIED
ch CDATA #IMPLIED >
! <!-- url : URL to media or playlist -->
<!ELEMENT url (include?, exclude?, start?) >
<!ATTLIST url
! type CDATA #REQUIRED
href CDATA #REQUIRED >
! <!-- include : RegExp for URLs to include -->
<!ELEMENT include (#PCDATA) >
! <!-- exclude : RegExp for URLs to exclude -->
<!ELEMENT exclude (#PCDATA) >
! <!-- start : Seek n seconds to skip commercial -->
<!ELEMENT start (#PCDATA) >
Index: stations.fxd
===================================================================
RCS file: /cvsroot/freevo/freevo/WIP/Wigren/Webradio/stations.fxd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stations.fxd 7 Oct 2003 05:38:41 -0000 1.1
--- stations.fxd 7 Oct 2003 06:13:22 -0000 1.2
***************
*** 1,3 ****
! <?xml version="1.0" ?>
<!-- This is a proposal to work out the ultimate fileformat for webradio stations -->
--- 1,4 ----
! <?xml version="1.0" encoding="iso8859-1"?>
! <!DOCTYPE freevo SYSTEM "stations.dtd">
<!-- This is a proposal to work out the ultimate fileformat for webradio stations -->
***************
*** 26,30 ****
</station>
! <station name="NRK P1" location="no" type="generic">
<info>
<desc lang="en">
--- 27,31 ----
</station>
! <station name="NRK P1" type="generic">
<info>
<desc lang="en">
***************
*** 46,50 ****
</stream>
<stream codec="MP3" kbps="56" br="22050" ch="2">
! <url type="m3u" href="http://media.hiof.no/streams/m3u/nrk-p1-56.m3u"; />
<include>http://.*\.mp3</include>
<exclude>.*jingle.*</exclude>
--- 47,51 ----
</stream>
<stream codec="MP3" kbps="56" br="22050" ch="2">
! <url type="m3u" href="http://media.hiof.no/streams/m3u/nrk-p1-56.m3u";>
<include>http://.*\.mp3</include>
<exclude>.*jingle.*</exclude>
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
