[Debconf-video-commits] r502 - package/trunk/src

[Ben Hutchings]

Author: benh
Date: 2009-07-23 20:17:52 +0000 (Thu, 23 Jul 2009)
New Revision: 502

Modified:
   package/trunk/src/dc-record-stream
   package/trunk/src/dc-start-sink
Log:
Fix starting of multiple sinks


Modified: package/trunk/src/dc-record-stream
===================================================================
--- package/trunk/src/dc-record-stream	2009-07-22 18:34:08 UTC (rev 501)
+++ package/trunk/src/dc-record-stream	2009-07-23 20:17:52 UTC (rev 502)
@@ -16,7 +16,9 @@
 fi
 
 # Start dvswitch and wait a short while for it to initialise.
-dvswitch & sleep 2
+dvswitch &
+dvswitch_pid=$!
+sleep 2
 
 # Start sources in specified order.  Wait a short while to allow them to
 # connect in order.
@@ -29,3 +31,5 @@
 for sink_loc in $SINKS; do
     dc-start-sink "$sink_loc"
 done
+
+wait $dvswitch_pid

Modified: package/trunk/src/dc-start-sink
===================================================================
--- package/trunk/src/dc-start-sink	2009-07-22 18:34:08 UTC (rev 501)
+++ package/trunk/src/dc-start-sink	2009-07-23 20:17:52 UTC (rev 502)
@@ -46,11 +46,13 @@
 	        --organization "'DebConf video team'"                   \
 	        --copyright "'DebConf video team'"                      \
 	        \| oggshout $ICECAST_ADDR $ICECAST_PORT                 \
-                "'$ICECAST_PASS'" "'/${ROOM_NAME// /_}.ogv'"            
+                "'$ICECAST_PASS'" "'/${ROOM_NAME// /_}.ogv'"            \
+		&
 	    ;;
 	file)
 	    ssh $sink_host dvsink-files -h $MIXER_HOST -p $MIXER_PORT \
-		"'$FILE_BASE/dv/%Y-%m-%d/$ROOM_NAME/%H:%M:%S.dv'"     
+		"'$FILE_BASE/dv/%Y-%m-%d/$ROOM_NAME/%H:%M:%S.dv'"     \
+		&
 	    ;;
 	*)
 	    echo >&2 "WARN: Ignoring sink '$sink_loc' with unknown scheme"