diff --git a/sbagen_select.sh b/sbagen_select.sh index 4531980..c885b64 100755 --- a/sbagen_select.sh +++ b/sbagen_select.sh @@ -11,9 +11,13 @@ SBAGenDir="/home/steven/apps/sbagen-1.4.4/" OGGDir="/home/steven/apps/sbagen-1.4.4/" - +sbgfile="" sbgfile=$(fdfind . ${SBAGenDir} --follow --type file --extension sbg | fzf --no-hscroll -m --height 90% --border --ansi --no-bold --header="Choose SBA file" --preview='sed -n "/^#/p" {}') - +oggfile="" oggfile=$(fdfind . ${SBAGenDir} --follow --type file --extension ogg | fzf --no-hscroll -m --height 90% --border --ansi --no-bold --header="Choose background" ) -/usr/bin/xterm -e /usr/bin/padsp_32 /home/steven/apps/sbagen-1.4.4/sbagen -m "${oggfile}" "${sbgfile}" & +if [ -z "${oggfile}" ];then + /usr/bin/xterm -e /usr/bin/padsp_32 /home/steven/apps/sbagen-1.4.4/sbagen "${sbgfile}" & +else + /usr/bin/xterm -e /usr/bin/padsp_32 /home/steven/apps/sbagen-1.4.4/sbagen -m "${oggfile}" "${sbgfile}" & +fi diff --git a/video-fzf-config b/video-fzf-config index a163254..62597b7 100755 --- a/video-fzf-config +++ b/video-fzf-config @@ -13,6 +13,7 @@ ############################################################################## SCRIPTDIR="$( cd "$(dirname "$0")" ; pwd -P )" LFBW="/home/steven/sourcecode/Linux-Fake-Background-Webcam/fake.py" +BACKGROUND_PATH="/home/steven/documents/fake_backgrounds/" get_active_cameras(){ for dev in `find /dev -iname 'video*' -printf "%f\n"` @@ -31,7 +32,10 @@ get_fake_cameras(){ } fake_background (){ - "${LFBW}" -b "${file_in}" --no-foreground -w "${real_cam}" -v "${fake_cam}" -W 640 -H 480 + +#youtube resolution + "${LFBW}" -b "${file_in}" --no-foreground -w "${real_cam}" -v "${fake_cam}" -W 854 -H 480 + } replace_video(){ @@ -69,8 +73,8 @@ echo "Using ${real_cam} and ${fake_cam}" # I can put in other options for LFBW later... if [ -z "$2" ];then - var=$(find /home/steven/documents/fake_backgrounds/ -type f -printf "%f\n" | fzf --no-hscroll -m --height 60% --border --ansi --no-bold --header "Which file to read in?" | xargs ) - file_in="/home/steven/documents/fake_backgrounds/${var}" + var=$(find "${BACKGROUND_PATH}" -type f -printf "%f\n" | fzf --no-hscroll -m --height 60% --border --ansi --no-bold --header "Which file to read in?" | xargs ) + file_in="${BACKGROUND_PATH}${var}" else file_in="$2" fi