More cleanup

diff --git a/playlist-get b/playlist-get
index b98056684667efed7734d28b061f9c3aa4199068..7f590a95c034b6fddd55959d7309359ff2640915 100755 (executable)
--- a/playlist-get
+++ b/playlist-get
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-# Get files for playlist
+# Get files for playlist using git-annex and mpd
+#
 #
 
 # Parameters

diff --git a/start-streaming b/start-streaming
index feff8a4374df447df5338a075e26081fb17bbf62..304cb90c65d11bcb84f21124ab9a393e156dc388 100755 (executable)
--- a/start-streaming
+++ b/start-streaming
@@ -52,17 +52,3 @@ gst-launch ximagesrc ! queue ! textoverlay text="$DESC" font-desc="50px" ! queue
 
 # norm=NTSC does not work on debian squeeze
 #gst-launch v4l2src norm=NTSC ! queue ! textoverlay text="$DESC" font-desc="50px" ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv,width=320,height=240 ! theoraenc bitrate=100 ! queue ! oggmux name=mux alsasrc ! queue ! audioconvert ! vorbisenc bitrate=48000  ! queue ! mux. mux. ! tee name=tt ! queue ! filesink location=$MOUNT tt. ! queue ! shout2send ip=$SERVER port=$PORT password=$PASS mount=/$MOUNT streamname="$NAME" description="$DESC" genre="$GENRE" url=$URL
-
-#gst-launch v4l2src norm=NTSC ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv,width=320,height=240 ! theoraenc bitrate=100 ! queue ! oggmux name=mux alsasrc ! queue ! audioconvert ! vorbisenc bitrate=48000  ! queue ! mux. mux. ! tee name=tt ! queue ! filesink location=$MOUNT tt. ! queue ! shout2send ip=$SERVER port=$PORT password=$PASS mount=/$MOUNT streamname="$NAME" description="$DESC" genre="$GENRE" url=$URL
-
-#gst-launch v4l2src norm=NTSC ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv,width=320,height=240 ! theoraenc bitrate=100 ! queue ! oggmux name=mux alsasrc ! queue ! audioconvert ! vorbisenc bitrate=48000  ! queue ! mux. mux. ! queue ! shout2send ip=$SERVER port=$PORT password=$PASS mount=/$MOUNT streamname="$NAME" description="$DESC" genre="$GENRE" url=$URL
-
-#gst-launch v4l2src norm=NTSC ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv,width=320,height=240 ! theoraenc bitrate=100 ! queue ! oggmux name=mux alsasrc ! queue ! audioconvert ! vorbisenc bitrate=48000  ! queue ! mux. mux. ! queue ! shout2send ip=orelha.radiolivre.org port=8000 password=SENHA mount=/MOUNT.ogv
-
-# gst-launch v4l2src ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv,width=320,height=240 ! tee name=tscreen ! queue ! autovideosink tscreen. ! queue ! videorate ! video/x-raw-yuv,framerate=25/2 !  queue ! theoraenc quality=16 ! queue ! oggmux name=mux alsasrc ! queue ! audioconvert ! vorbisenc quality=0.2 ! queue ! queue ! mux. mux. ! queue ! tee name=tfile ! queue ! filesink location=stream.ogg tfile. ! queue ! shout2send ip=icecast.server port=8000 mount=test.ogg password=secret
-
-# gst-launch-0.10 webmmux name=mux streamable=true ! queue2 ! shout2send mount=/test.webm port=8000 password=teste ip=173.255.215.196 v4l2src ! video/x-raw-yuv,width=320,height=240 ! ffmpegcolorspace ! vp8enc bitrate=96000 threads=6 ! queue2 ! mux.video_0 alsasrc ! audio/x-raw-int,rate=24000,channels=1 ! queue2 !  audioconvert ! vorbisenc max-bitrate=48000 ! queue2 ! mux.audio_0
-
-# gst-launch-0.10 webmmux name=mux streamable=true ! queue2 ! shout2send mount=/test.webm port=8000 password=teste ip=173.255.215.196 v4l2src ! video/x-raw-yuv,width=320,height=240 ! ffmpegcolorspace ! vp8enc bitrate=96000 threads=6 ! queue2 ! mux.video_0 audiotestsrc ! audioconvert ! vorbisenc max-bitrate=48000 ! queue2 ! mux.audio_0
-
-# gst-launch-0.10 webmmux name=mux streamable=true ! queue2 ! shout2send mount=/test.webm port=8000 password=teste ip=173.255.215.196 v4l2src ! video/x-raw-yuv,width=320,height=240 ! ffmpegcolorspace ! vp8enc bitrate=96000 threads=0 ! queue2 ! mux.video_0 pulsesrc device="alsa_input.pci-0000_00_1b.0.analog-stereo" ! audioconvert ! vorbisenc max-bitrate=48000 ! queue2 ! mux.audio_0