X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=ffs;h=4ffb0a0f6e184b23acba9108e1821247c7498b69;hb=3342374657bd712f14cd772378b23d2bca3382cb;hp=d6dc01ff07018546a282f57a782bd52aa6168ccb;hpb=e801d1a57f0b30c57c6f644ab06a0f790159b236;p=distro-setup

diff --git a/ffs b/ffs
index d6dc01f..4ffb0a0 100755
--- a/ffs
+++ b/ffs
@@ -41,8 +41,10 @@ Usage: ${0##*/} [OPTIONS] [sysops|tech|staff]
 3 mountpoints: fsf-sysops (default, public), fsf (all staff), fsf-tech (tech team)
 
 -d    debug.
--f    Stream full screen even high resolution.
--t    Stream tall half screen
+-r RESOLUTION_TYPE
+   full: full screen even high resolution.
+   tall (default): half screen.
+   quarter: self evident
 -u    Undelayed. Removes 5 second video delay, and about 4 second audio delay.
 -w    do not launch watch of stream
 
@@ -69,8 +71,8 @@ delay=true
 loglevel=fatal
 watch=true
 fullscreen=false
-tall=false
-temp=$(getopt -l help hdftuw "$@") || usage 1
+tall=true
+temp=$(getopt -l help hdr:uw "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
@@ -80,13 +82,22 @@ while true; do
       loglevel=info
       ffp_args+=(-d)
       ;;
-    -f)
-      fullscreen=true
-      tall=false
-      ;;
-    -t)
-      fullscreen=false
-      tall=true
+    -r)
+      case $2 in
+        tall)
+          fullscreen=false
+          tall=true
+          ;;
+        quarter)
+          fullscreen=false
+          tall=false
+          ;;
+        full)
+          fullscreen=true
+          tall=false
+          ;;
+      esac
+      shift
       ;;
     -w)
       watch=false
@@ -224,9 +235,6 @@ opts=(
 [vol0][vol1] amerge=inputs=2;
 [2]zmq='b=tcp\://127.0.0.1\:5557',drawbox=color=0x262626,drawtext=fontsize=90: fontcolor=beige: x=40: y=40: text=''${delay_arg}[out]"
 
-#  [vol0][vol1] amerge=inputs=2,adelay=6000:all=1;
-
-
   # An online source says to match a 5 second vid delay, we can do an
   # audio delay filter: "adelay=5000|5000". However, we already get
   # a stream delay of about 2 seconds, and having the audio be about
@@ -264,8 +272,9 @@ opts=(
 
 rm -f /tmp/iank-ffmpeg-interlude-toggle
 
-# start muted
-pactl set-source-mute @DEFAULT_SOURCE@ true
+# system mute. disabled, just using application level mute atm.
+#
+# pactl set-source-mute @DEFAULT_SOURCE@ true
 
 if pkill -f ^ffmpeg.\*icecast://source.\*/fsf; then
   sleep 1