Use jq instead of sed voodoo to parse our data so it's more maintaina…

…ble.

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "vastfmt"]
 	path = vastfmt
 	url = https://github.com/Materdaddy/vastfmt.git
+[submodule "jq"]
+	path = jq
+	url = https://github.com/stedolan/jq.git

callbacks.sh

@@ -106,9 +106,9 @@ case $operation in
 			vast_args="$vast_args --rds"
 		fi
 
-		# This voodoo turns our json into environment variables we
-		# can simply parse
-		eval $(echo $DATA | sed 's/^{//;s/}$//;s/,\s*/\n/g;s/"\([^"]*\)"\:\s*"\([^"]*\)"/\1="\2"/g')
+		# Use jq to parse our JSON data
+		artist=$(echo $DATA | ./jq/jq -r ".artist")
+		title=$(echo $DATA | ./jq/jq -r ".title")
 
 		# Try to grab artist if Media exists.  This assumes the filename
 		# is "Artist - Title.extension"

fpp_install.sh

@@ -27,4 +27,12 @@ make -C vastfmt CXX=$CXX
 mkdir -p bin
 cp vastfmt/radio bin/rds
 
+# Get jq going for parsing our json data
+pushd jq
+autoreconf -i
+./configure --disable-maintainer-mode
+make src/builtin.inc
+make
+popd
+
 popd