fix up cspan feeds to use the newer format

diff --git a/watch_tv b/watch_tv
index f9f96dc110abbb48190e6ecdb3b4b92cb1e1a615..09b629f5f229c1544a682be06b8c1a7e49bc5153 100755 (executable)
--- a/watch_tv
+++ b/watch_tv
@@ -3,17 +3,21 @@
 ZOOM=3
 
 if [ "$1" == "bloomberg" ]; then
-    FEED="-r rtmpt://cp87869.live.edgefcs.net:1935/live -a live -y us_300@21006 -W http://cdn.gotraffic.net/v/20110210_153738//flash/BloombergMediaPlayer.swf -p http://www.bloomberg.com/tv/"
+    FEED="-v -r rtmpt://cp87869.live.edgefcs.net:1935/live -a live -y us_300@21006 -W http://cdn.gotraffic.net/v/20110210_153738//flash/BloombergMediaPlayer.swf -p http://www.bloomberg.com/tv/"
     ZOOM=2
 elif [ "$1" == "cnn" ]; then
-    FEED="-r rtmp://cp44679.live.edgefcs.net/live -y cnn_stream1_low@2785 -a live -W http://i.cdn.turner.com/cnn/.element/apps/CNNLive/2.1.5.7/assets/swfs/LivePlayer.swf -p http://www.cnn.com/video/flashLive/live.html?stream=1"
+    FEED="-v -r rtmp://cp44679.live.edgefcs.net/live -y cnn_stream1_low@2785 -a live -W http://i.cdn.turner.com/cnn/.element/apps/CNNLive/2.1.5.7/assets/swfs/LivePlayer.swf -p http://www.cnn.com/video/flashLive/live.html?stream=1"
     ZOOM=2
 elif [ "$1" == "cspan3" ]; then
-    FEED="-r rtmp://cp82348.live.edgefcs.net:1935/live -y CSPAN3@14847 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN3/"
+    FEED="-v -r rtmp://cp82348.live.edgefcs.net:1935/live -y CSPAN3@14847 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN3/"
 elif [ "$1" == "cspan2" ]; then
-    FEED="-r rtmp://cp82347.live.edgefcs.net:1935/live -y CSPAN2@14846 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN2/"
+    FEED="-V -v -r rtmpt://cp82347.live.edgefcs.net:1935/live?ovpfv=2.1.4 --tcUrl rtmp://cp82347.live.edgefcs.net:1935/live?ovpfv=2.1.4 --app live?ovpfv=2.1.4 --flashVer LNX.11,2,202,238 --playpath CSPAN2@14846 --swfVfy http://www.c-span.org/cspanVideoHD.swf --pageUrl http://www.c-span.org/"
+    ZOOM="3 -af volume=-200"
+#    FEED="-v -r rtmp://cp82347.live.edgefcs.net:1935/live -y CSPAN2@14846 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN2/"
 else
-    FEED="-v -r rtmp://cp82346.live.edgefcs.net:1935/live -y CSPAN1@14845 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN/"
+#     FEED="-v -r rtmp://cp82346.live.edgefcs.net:1935/live -y CSPAN1@14845 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN/"
+#     FEED="-v -r rtmp://fms.c-span.org:1935/fastplay?ovpv=2.1.4 -y CSPAN1@14845 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN/"
+    FEED="-V -v -r rtmpt://cp82346.live.edgefcs.net:1935/live?ovpfv=2.1.4 --tcUrl rtmp://cp82346.live.edgefcs.net:1935/live?ovpfv=2.1.4 --app live?ovpfv=2.1.4 --flashVer LNX.11,2,202,238 --playpath CSPAN1@14845 --swfVfy http://www.c-span.org/cspanVideoHD.swf --pageUrl http://www.c-span.org/"
 fi;
 
-rtmpdump -v $FEED | mplayer -xy $ZOOM -
+rtmpdump $FEED | mplayer -xy $ZOOM -