[Debconf-video-commits] r610 - in package/trunk: debian src

[Holger Levsen]

Author: holger
Date: 2010-08-01 02:35:18 +0000 (Sun, 01 Aug 2010)
New Revision: 610

Modified:
   package/trunk/debian/changelog
   package/trunk/src/dc-start-sink
   package/trunk/src/dc-start-source
Log:
dc-start-sink/source: Dont go into the background, we can do this
when running the commands and it prevents xterm to stay up.

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2010-08-01 02:07:54 UTC (rev 609)
+++ package/trunk/debian/changelog	2010-08-01 02:35:18 UTC (rev 610)
@@ -1,3 +1,10 @@
+debconf-video (20100731.4) squeeze; urgency=low
+
+  * dc-start-sink/source: Dont go into the background, we can do this
+    when running the commands and it prevents xterm to stay up.
+
+ -- Holger Levsen <holger at debian.org>  Sat, 31 Jul 2010 22:35:13 -0400
+
 debconf-video (20100731.3) squeeze; urgency=low
 
   * Add VIDEO_STANDARD=ntsc to dvswitchrc. 

Modified: package/trunk/src/dc-start-sink
===================================================================
--- package/trunk/src/dc-start-sink	2010-08-01 02:07:54 UTC (rev 609)
+++ package/trunk/src/dc-start-sink	2010-08-01 02:35:18 UTC (rev 610)
@@ -47,13 +47,11 @@
 	        --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"

Modified: package/trunk/src/dc-start-source
===================================================================
--- package/trunk/src/dc-start-source	2010-08-01 02:07:54 UTC (rev 609)
+++ package/trunk/src/dc-start-source	2010-08-01 02:35:18 UTC (rev 610)
@@ -26,8 +26,7 @@
 		source_device=
 	    fi
 	    ssh $source_host dvsource-alsa -h $MIXER_HOST  \
-		-p $MIXER_PORT -s $VIDEO_STANDARD ${source_device} \
-		&
+		-p $MIXER_PORT -s $VIDEO_STANDARD ${source_device} 
 	    ;;
 	firewire | firewire+tally)
 	    source_host="${source_path%%/*}"
@@ -43,8 +42,7 @@
 	    fi
 	    ssh $source_host dvsource-firewire -h $MIXER_HOST  \
 		-p $MIXER_PORT ${source_card:+-c $source_card} \
-		$tally_extra \
-		&
+		$tally_extra 
 	    ;;
 	*)
 	    echo >&2 "WARN: Ignoring source '$source_loc' with unknown scheme"