diff --git a/vars b/vars index cb3f6c6..241280c 100644 --- a/vars +++ b/vars @@ -6,9 +6,6 @@ playerpackage=vlc randomsh=randomvideo.sh pingserver=raspbian.raspberrypi.org usbdevice=sda1 -camparamr=random -camparam1=birdcam1 -camparam2=birdcam2 # automount.sh mountpoint=/media/video @@ -25,6 +22,9 @@ camerash=/home/pi/birdcam/view_birdcam.sh buttonpolling=0.05 buttontimeout=1 countermax=1200 +camparamr=random +camparam1=birdcam1 +camparam2=birdcam2 # randomvideo.sh folderext=/media/video/video @@ -32,5 +32,6 @@ folderint=/home/pi/birdcam/video # view_birdcam.sh cameralist=/home/pi/birdcam/conf/cameralist.txt -streamurl=rtsp://$1:554/user=admin&password=&channel=1&stream=0.sdp?real_stream randompathsh=/home/pi/birdcam/randomvideo.sh + +#streamurl=rtsp://$1:554/user=admin&password=&channel=1&stream=0.sdp?real_stream - Please set local in file view_birdcam.sh! diff --git a/view_birdcam.sh b/view_birdcam.sh index 1afcf1d..92d55ee 100755 --- a/view_birdcam.sh +++ b/view_birdcam.sh @@ -34,7 +34,6 @@ fi cameralist="$(cat $vars | grep cameralist | cut -d'=' -f2)" playerproc="$(cat $vars | grep playerproc | cut -d'=' -f2)" playerparam="$(cat $vars | grep playerparam | cut -d'=' -f2)" -streamurl="rtsp://$1:554/user=admin&password=&channel=1&stream=0.sdp?real_stream" randomvideosh="$(cat $vars | grep randompathsh | cut -d'=' -f2)" randomvideoproc="$(cat $vars | grep randomsh | cut -d'=' -f2)" @@ -47,15 +46,17 @@ if [ -n "$(pgrep $randomvideoproc)" ]; then pkill $randomvideoproc fi -if [ "$1" = "$(cat $vars | grep camparamr | cut -d'=' -f2)" ]; then +if [ "$1" = "random" ]; then $randomvideosh exit 0 fi -if [ "$1" = "$(cat $vars | grep camparam1 | cut -d'=' -f2)" ]; then +streamurl="rtsp://$1:554/user=admin&password=&channel=1&stream=0.sdp?real_stream" + +if [ "$1" = "birdcam1" ]; then $player_path $playerparam "$streamurl" -elif [ "$1" = "$(cat $vars | grep camparam2 | cut -d'=' -f2)" ]; then +elif [ "$1" = "birdcam2" ]; then $player_path $playerparam "$streamurl" else