Skip to content

Commit

Permalink
Remove some old code
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkulp
dkulp committed Sep 2, 2019
1 parent 8c0c43d commit 950981b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 180 deletions.
167 changes: 0 additions & 167 deletions callbacks.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,170 +49,3 @@ while true; do
esac
done

killall rds
vast_args="$(dirname $0)/bin/rds"

if [ ! -e ${CFGDIR}/plugin.fpp-vastfmt ]; then
echo "Error finding plugin settings, please configure FMT!" >&2
exit 1
fi

transmit_setting=$(grep -i "^TurnOff\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*//")
power=$(grep -i "^Power\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*//")
rds_setting=$(grep -i "^RdsType\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*\"\(.*\)\"/\1/")
rds_static_text=$(grep -i "^RDSStaticText\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*\"\(.*\)\"/\1/")
set_frequency=$(grep -i "^SetFreq\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*//")
frequency=$(grep -i "^Frequency\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*//")
station=$(grep -i "^Station\s*=.*" ${CFGDIR}/plugin.fpp-vastfmt | sed -e "s/.*=\s*\"\(.*\)\"/\1/")

if [ -n "$DEBUG" ]; then

echo "$DATA" >&2

echo "set transmit: $transmit_setting" >&2
echo "power: $power" >&2
echo "rds type: $rds_setting" >&2
echo "rds static text: $rds_static_text" >&2
echo "set freq: $set_frequency" >&2
echo "frequency: $frequency" >&2
echo "station: $station" >&2

fi


case $operation in
media)
# Without this sleep, sometimes our playlist start and
# media callback are stacked too close to each other and
# seem to upset the VastFMT
sleep 1


if [ "x$rds_setting" != "xdisabled" ]; then
vast_args="$vast_args --rds"
fi

# Use jq to parse our JSON data
artist=$(echo $DATA | jq -r ".artist")
title=$(echo $DATA | jq -r ".title")

# Try to grab artist if Media exists. This assumes the filename
# is "Artist - Title.extension"
if [ -z "$artist" ] && [ -n "$Media" ]; then
artist="$(echo $Media | sed -n '/-/p' | cut -d- -f1 | sed 's/^\s*//g;s/\s*$//g')"
fi
# Try to grab title if Media exists. This assumes the filename
# is "Artist - Title.extension"
if [ -z "$title" ] && [ -n "$Media" ]; then
title="$(echo $Media | sed -n '/-/p' | cut -d- -f2 | sed 's/^\s*//g;s/\s*\.\(ogg\|mp4\|mkv\|mp3\)\s*$//g;')"
fi

if [ -z "$rds_setting" ]; then
rds_setting=rtp
fi

case $rds_setting in
rtp)
if [ -n "$artist" ] && [ -n "$title" ]; then
vast_args="$vast_args --artist \"$artist\" --title \"$title\""
elif [ -n "$artist" ]; then
vast_args="$vast_args --artist \"$artist\""
elif [ -n "$title" ]; then
vast_args="$vast_args --title \"$title\""
elif [ -n "$Media" ]; then
vast_args="$vast_args --title \"${Media%.*}\""
elif [ -n "$Sequence" ]; then
vast_args="$vast_args --title \"${Sequence%.*}\""
fi
;;
rt)
if [ -n "$artist" ] && [ -n "$title" ]; then
vast_args="$vast_args -R \"$artist - $title\""
elif [ -n "$Media" ]; then
vast_args="$vast_args -R \"${Media%.*}\""
elif [ -n "$artist" ]; then
vast_args="$vast_args -R \"$artist\""
elif [ -n "$title" ]; then
vast_args="$vast_args -R \"$title\""
elif [ -n "$Sequence" ]; then
vast_args="$vast_args -R \"${Sequence%.*}\""
fi
;;
ps|disabled|*)
if [ -n "$DEBUG" ]; then
echo "RDS Setting $rds_setting doesn't need to write out individual songs, do nothing" >&2
fi
;;
esac

if [ -n "$DEBUG" ]; then
echo $vast_args >&2

# Log to a file as well
date >> ${DEBUG_LOG}
echo $vast_args >> ${DEBUG_LOG}
echo >> ${DEBUG_LOG}
fi

if [ -n "$DEBUG" ]; then
eval timeout 5 $vast_args >> ${DEBUG_LOG} 2>&1
else
eval timeout 5 $vast_args
fi
;;
playlist)
# Without this sleep, sometimes our playlist start and
# media callback are stacked too close to each other and
# seem to upset the VastFMT
sleep 1

if echo $DATA | grep "Action" | grep -qc "start"; then
echo "turn things on..."
if [ "x$transmit_setting" == "x1" ]; then
vast_args="$vast_args -t"
if [ -n "$power" ]; then
vast_args="$vast_args -p $power"
fi
fi
if [ "x$set_frequency" == "x1" ]; then
vast_args="$vast_args -f $frequency"
fi
if [ "x$rds_setting" != "xdisabled" ]; then
if [ ${#station} -gt 0 ]; then
vast_args="$vast_args --rds -s \"$station\""
else
vast_args="$vast_args --rds"
fi
fi
if [ ${#rds_static_text} -gt 0 ]; then
vast_args="$vast_args --rds-text \"$rds_static_text\""
fi
else
echo "turn things off..."
if [ "x$transmit_setting" == "x1" ]; then
vast_args="$vast_args -n"
fi
if [ ${#rds_static_text} -gt 0 ]; then
vast_args="$vast_args --rds-text \"$rds_static_text\""
fi
fi

if [ -n "$DEBUG" ]; then
echo $vast_args >&2

# Log to a file as well
date >> ${DEBUG_LOG}
echo $vast_args >> ${DEBUG_LOG}
echo >> ${DEBUG_LOG}
fi

if [ -n "$DEBUG" ]; then
eval timeout 5 $vast_args >> ${DEBUG_LOG} 2>&1
else
eval timeout 5 $vast_args
fi
;;
*)
die "You must specify a callback type!"
;;
esac
13 changes: 0 additions & 13 deletions fpp_install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,10 @@

pushd $(dirname $(which $0))

git submodule init
git submodule update

# Before building, check that we have libusb-1.0-0-dev
if ! dpkg --get-selections | grep -cq libusb-1.0-0-dev; then
sudo apt-get -q -y update
sudo apt-get -q -y --reinstall install libusb-1.0-0-dev
fi

make -C vastfmt

mkdir -p bin
cp vastfmt/radio bin/rds

if ! dpkg --get-selections | grep -cq "^jq"; then
sudo apt-get -q -y update
sudo apt-get -q -y install jq
fi

popd

0 comments on commit 950981b

Please sign in to comment.