From 753b78d18b7c2b53f5e3449ff6ea379d853cb692 Mon Sep 17 00:00:00 2001
From: Gerrit Linnemann <linnemann@adawim.com>
Date: Mon, 2 Nov 2015 16:10:52 +0100
Subject: [PATCH] ready4testing

---
 kitchenradio/app/radio.js | 26 +++++++++++++++++++++-----
 kitchenradio/config.json  |  6 ++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/kitchenradio/app/radio.js b/kitchenradio/app/radio.js
index 4faa8b1..5fa5edb 100644
--- a/kitchenradio/app/radio.js
+++ b/kitchenradio/app/radio.js
@@ -15,6 +15,8 @@ var Log = null
 var Helper = null;
 var Conf = null;
 
+var Child = null;
+
 
 exports.init = function(Express, Configuration) {
 	App = Express;
@@ -51,6 +53,14 @@ exports.play = function(idx) {
   var channel = Conf.channels[idx];
   if(channel !== undefined) {
     var stream2play = channel.stream;
+    
+    if(Helper.isDefinedAndNotNull(Child)) {
+      try {
+        Child.kill();
+      } catch(err) {
+        Log.error('Radio: Error killing process');
+      }
+    }
 
     /*try {
       var parsers = require("playlist-parser");
@@ -68,7 +78,7 @@ exports.play = function(idx) {
     }*/
 
 
-    var child = spawn(
+    var Child = spawn(
       'mplayer',
       [
         '-slave',
@@ -77,13 +87,19 @@ exports.play = function(idx) {
       ]
     );
     
-    child.stdout.on('data', function(chunk) {
+    // listen for any response from the child
+    Child.stdout.on('data', function(chunk) {
       Log.log('Radio: ' + chunk);
     });
-
-    child.on('exit', function (code){
-      Log.log('Radio: Child process exited with exit code ' + code);
+    
+    // listen for any errors
+    Child.stderr.on('data', function (chunk) {
+      Log.error('Radio: ' + chunk);
     });
+
+    /*Child.on('exit', function (code){
+      Log.log('Radio: Child process exited with exit code ' + code);
+    });*/
   } else {
     Log.error('Radio: No channel defined!');
   }
diff --git a/kitchenradio/config.json b/kitchenradio/config.json
index 156fa24..6b94fa8 100644
--- a/kitchenradio/config.json
+++ b/kitchenradio/config.json
@@ -11,6 +11,12 @@
       "title": "WDR2",
       "stream": "http://www.wdr.de/wdrlive/media/mp3/wdr2-ostwestfalen-lippe.m3u",
       "icon": "http://chip01.chipimages.de/crawler-mq/itunes/15/63/69/36/80/299611083/f9316ffa005339794c7d80d210b8464b.jpg"
+    },
+    {
+      "type": "radiostream",
+      "title": "1Live",
+      "stream": "http://www.wdr.de/wdrlive/media/mp3/1live.m3u",
+      "icon": "https://www.android-user.de/wp-content/uploads/2015/01/icon-1live.png"
     }
   ],
   "logging": {