From 86888a9ae7e0a11bbcbe719b7c7ff5a2bbc2a93e Mon Sep 17 00:00:00 2001
From: James <inbox.dev@jhodges.co.uk>
Date: Sat, 5 Oct 2019 09:51:08 +0100
Subject: [PATCH] improve

---
 .gitignore |  1 +
 gui        | 18 +++++++++++++-----
 info       |  2 ++
 play       |  8 ++++----
 stop       |  6 ++++++
 5 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 create mode 100755 info
 create mode 100755 stop

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..994dffe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+download.txt
diff --git a/gui b/gui
index 34a34bf..75875dd 100755
--- a/gui
+++ b/gui
@@ -5,11 +5,10 @@ GTKDIALOG=gtkdialog
 radioBtn() {
         echo '<button>
                                 <label>'$1'</label>
-                                <action>./play "'$2'"</action>
+                                <action>./play "'$1'" "'$2'"</action>
                         </button>'
 }
 
-
 MAIN_DIALOG='
 <window title="Radio">
 	<vbox>
@@ -60,11 +59,20 @@ MAIN_DIALOG='
                         '"`radioBtn "Radio Dom Druzhbi" http://62.109.3.230:80/dom_druzhby.mp3`"'
                         '"`radioBtn "100CHILL" http://streaming211.radionomy.com:80/100-CHILL`"'
                         '"`radioBtn "Radio House" http://142.44.135.172:8001/listen`"'
+                  </hbox>
+                  <hbox>
+                          '"`radioBtn "AmbianceReggae" http://streaming211.radionomy.com:80/Ambiance-Reggae`"'
+                          '"`radioBtn "UbuntuFM Reggae Radio" http://streaming307.radionomy.com:80/UbuntuFM-Reggae`"'
+                          '"`radioBtn "ReggaeNation" http://streaming313.radionomy.com:80/ReggaeNation`"'
+                          '"`radioBtn "HearMe - Reggae" http://hearme.fm:8549/stream`"'
+                          '"`radioBtn "Reggaewave Radio" http://rascast.podzone.org:8014/reggaewave`"'
+                          '"`radioBtn "Big Reggae Mix" http://ais-sa2.wdc01.cdnstream.com:80/2294_64.aac`"'
+                          '"`radioBtn "Hoy Si Que Se Bebe (Acapella)" http://113fm-edge2.cdnstream.com:80/5228_128`"'
                 </hbox>
                 <text wrap="false" xalign="0.5" selectable="true">
                          <variable>txtTitles</variable>
                          <label>This text will be overwritten with the data from the command.</label>
-                         <input>tail -n100 /tmp/play | grep icy-title | sed -e 's/icy-title://' | tail -n1</input>
+                         <input>./info</input>
                 </text>
                 <timer interval="1" visible="false">
                         <action>refresh:txtTitles</action>
@@ -74,7 +82,7 @@ MAIN_DIALOG='
 			<button>
 				<input file icon="media-record"></input>
 				<label>Download</label>
-				<action>tail -n100 /tmp/play | grep icy-title | sed -e 's/icy-title://' | tail -n1 >> download.txt </action>
+				<action>(echo ; date ; ./info)  >> download.txt</action>
 			</button>
 			<button>
 				<input file icon="media-playback-stop-symbolic"></input>
@@ -92,4 +100,4 @@ case $1 in
 	*) $GTKDIALOG -G +10000 +10000 --space-expand=true --space-fill=true --program=MAIN_DIALOG ;;
 esac
 
-killall mpv
+./stop
diff --git a/info b/info
new file mode 100755
index 0000000..8fbceb8
--- /dev/null
+++ b/info
@@ -0,0 +1,2 @@
+echo Station: `tail -n100 /tmp/play | grep touch_radio_name | sed -e 's/touch_radio_name://' | tail -n1`
+echo Track: `tail -n100 /tmp/play | grep icy-title | sed -e 's/icy-title://' | tail -n1`
diff --git a/play b/play
index f633061..3a0595d 100755
--- a/play
+++ b/play
@@ -1,7 +1,7 @@
 #!/bin/bash
-killall mpv
+./stop
 echo "icy-title: " >> /tmp/play
 echo "---------------" >> /tmp/play
-echo $1 >> /tmp/play
-mpv --quiet $1 >> /tmp/play 2>&1 &
-
+echo "touch_radio_name: $1" >> /tmp/play
+echo "touch_radio_url: $2" >> /tmp/play
+mpv --quiet $2 >> /tmp/play 2>&1 &
diff --git a/stop b/stop
new file mode 100755
index 0000000..9d9917e
--- /dev/null
+++ b/stop
@@ -0,0 +1,6 @@
+#!/bin/bash
+killall mpv
+echo STOP >> /tmp/play
+echo touch_radio_name: >> /tmp/play
+echo touch_radio_url: >> /tmp/play
+echo icy-title: >> /tmp/play