[Debconf-video-commits] r655 - in package/trunk/conf: dc11 streaming/debconf

[Holger Levsen]

Author: holger
Date: 2011-07-19 15:23:14 +0000 (Tue, 19 Jul 2011)
New Revision: 655

Modified:
   package/trunk/conf/dc11/default-scratchy
   package/trunk/conf/dc11/default-selma
   package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
   package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
Log:
rename rooms to talkroom1 and talkroom2

Modified: package/trunk/conf/dc11/default-scratchy
===================================================================
--- package/trunk/conf/dc11/default-scratchy	2011-07-19 13:10:15 UTC (rev 654)
+++ package/trunk/conf/dc11/default-scratchy	2011-07-19 15:23:14 UTC (rev 655)
@@ -1,7 +1,7 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf11'
 VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
-ROOM_NAME="Round room"
+ROOM_NAME="talkroom2"
 # Sources and sinks
 SOURCES="firewire:scratchy firewire:blinky firewire:itchy"
 SINKS="icecast:todd file:scratchy"

Modified: package/trunk/conf/dc11/default-selma
===================================================================
--- package/trunk/conf/dc11/default-selma	2011-07-19 13:10:15 UTC (rev 654)
+++ package/trunk/conf/dc11/default-selma	2011-07-19 15:23:14 UTC (rev 655)
@@ -1,7 +1,7 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf11'
 VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
-ROOM_NAME="The big room"
+ROOM_NAME="talkroom1"
 # Sources and sinks
 SOURCES="firewire:sideshow firewire:patty firewire:jackie"
 SINKS="icecast:ned file:selma"

Modified: package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2011-07-19 13:10:15 UTC (rev 654)
+++ package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2011-07-19 15:23:14 UTC (rev 655)
@@ -41,7 +41,7 @@
     <relay>
         <server>int-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/big_room.ogv</mount>
+        <mount>/talkroom1.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -50,18 +50,18 @@
     <relay>
         <server>int-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/round_room.ogv</mount>
+        <mount>/talkroom2.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
     </relay>
 
     <mount>
-        <mount-name>/big_room.ogv</mount-name>
+        <mount-name>/talkroom1.ogv</mount-name>
     </mount>
 
     <mount>
-        <mount-name>/round_room.ogv</mount-name>
+        <mount-name>/talkroom2.ogv</mount-name>
     </mount>
 
     <mount>

Modified: package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2011-07-19 13:10:15 UTC (rev 654)
+++ package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2011-07-19 15:23:14 UTC (rev 655)
@@ -46,7 +46,7 @@
     <relay>
         <server>ext-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/big_room.ogv</mount>
+        <mount>/talkroom1.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -55,7 +55,7 @@
     <relay>
         <server>ext-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/round_room.ogv</mount>
+        <mount>/talkroom2.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -72,13 +72,13 @@
 
 
     <mount>
-        <mount-name>/big_room.ogv</mount-name>
+        <mount-name>/talkroom1.ogv</mount-name>
         <fallback-mount>/replay-ext.ogv</fallback-mount>
         <fallback-override>1</fallback-override>
     </mount>
 
     <mount>
-        <mount-name>/round_room.ogv</mount-name>
+        <mount-name>/talkroom2.ogv</mount-name>
         <fallback-mount>/replay-ext.ogv</fallback-mount>
         <fallback-override>1</fallback-override>
     </mount>