[xiph-commits] r3519 - in standards/roe: . examples

Sat Mar 22 07:58:15 PDT 2008

Author: silvia
Date: 2008-03-22 07:58:14 -0700 (Sat, 22 Mar 2008)
New Revision: 3519

Modified:
   standards/roe/examples/roe_example3.xml
   standards/roe/roe_1_0.xsd
Log:
Added a required default attribute to the "switch" tag in ROE and thus to the examples.



Modified: standards/roe/examples/roe_example3.xml
===================================================================

--- standards/roe/examples/roe_example3.xml	2008-03-22 14:48:59 UTC (rev 3518)
+++ standards/roe/examples/roe_example3.xml	2008-03-22 14:58:14 UTC (rev 3519)
@@ -7,15 +7,15 @@
 	</head>
 	<body>
 		<track id="v" provides="video">
-		  <switch distinction="angle">
+		  <switch distinction="angle" default="v1">
 	      	<mediaSource id="v1" content-type="video/theora"
 				src="http://example.com/angle1.ogv?track=v1&amp;t=t1/t2" />
 	      	<mediaSource id="v2" content-type="video/theora" src="http://example.com/angle2.ogv" />
 	      </switch>
 		</track>
 		<track id="a" provides="audio">
-	      <switch distinction="language">
-			<switch distinction="bitrate">
+	      <switch distinction="language" default="a3">
+			<switch id="a1" distinction="bitrate" default="a1b1">
 			  <mediaSource id="a1b1" lang="en" content-type="audio/vorbis"
 				src="http://example.com/lang1b1.oga" />
 			  <mediaSource id="a1b2" lang="en" content-type="audio/vorbis"
@@ -23,16 +23,16 @@
 			</switch>
 	     	<mediaSource id="a2" lang="de" content-type="audio/vorbis"
 		 		src="http://example.com/lang2.oga" />
-		    <seq>
-			  <mediaSource id="a3" lang="fr" content-type="audio/vorbis"
-				src="http://example.com/lang3.oga" />
-			  <mediaSource id="a4" lang="fr" content-type="audio/vorbis"
+		    <seq id="a3">
+			  <mediaSource id="a3a" lang="fr" content-type="audio/vorbis"
 				src="http://example.com/lang3a.oga" />
+			  <mediaSource id="a3b" lang="fr" content-type="audio/vorbis"
+				src="http://example.com/lang3b.oga" />
 			</seq>		
 	      </switch>
 		</track>
 		<track id="t" provides="text overlay">
-	      <switch distinction="language">
+	      <switch distinction="language" default="t1">
 	        <mediaSource id="t1" lang="en" content-type="text/cmml"
 				src="http://example.com/transcript1.cmml" />
 	        <mediaSource id="t2" lang="de" content-type="text/cmml"
@@ -42,7 +42,7 @@
 	      </switch>
 		</track>
 		<track id="cc" provides="closed caption">
-	      <switch distinction="language">
+	      <switch distinction="language" default="cc1">
 	        <mediaSource id="cc1" lang="en" content-type="text/cmml" src="http://example.com/cc1.cmml" />
 	        <mediaSource id="cc2" lang="de" content-type="text/cmml" src="http://example.com/cc2.cmml" />
 	        <mediaSource id="cc3" lang="fr" content-type="text/cmml" src="http://example.com/cc3.cmml" />

Modified: standards/roe/roe_1_0.xsd
===================================================================
--- standards/roe/roe_1_0.xsd	2008-03-22 14:48:59 UTC (rev 3518)
+++ standards/roe/roe_1_0.xsd	2008-03-22 14:58:14 UTC (rev 3519)
@@ -255,6 +255,7 @@
       <xs:attribute name="distinction" type="xs:string" use="required" />
       <xs:attribute name="id" type="xs:ID" use="required" />
       <xs:attribute name="title" type="xs:string"/>
+      <xs:attribute name="default" type="xs:ID" use="required"require />
     </xs:complexType>
   </xs:element>
 

