From f9ff63c346db65297f80e867a4a61e9848478f74 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Sat, 17 May 2014 21:06:58 +0100
Subject: [PATCH] updates to mpd node

---
 social/music/69-mpd.html |  4 ++--
 social/music/69-mpd.js   | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/social/music/69-mpd.html b/social/music/69-mpd.html
index acfc07be..b06bd5e7 100644
--- a/social/music/69-mpd.html
+++ b/social/music/69-mpd.html
@@ -24,7 +24,7 @@
 
 <script type="text/x-red" data-help-name="mpd out">
     <p>MPD music control output node.</p>
-    <p>Expects <b>msg.payload</b> to be a valid mpc command. Currently only simple commands that expect no reply are supported.</p>
+    <p>Expects <b>msg.payload</b> to be a valid mpc command. Currently only simple commands that expect no reply are supported. play, pause, next, previous, stop, etc.</p>
 </script>
 
 <script type="text/javascript">
@@ -57,7 +57,7 @@
 
 <script type="text/x-red" data-help-name="mpd in">
     <p>MPD music control input node.</p>
-    <p>Creates a <b>msg.payload</b> object with Artist, Album, Track, Genre and Date.</p>
+    <p>Creates a <b>msg.payload</b> object containing Artist, Album, Track, Genre and Date.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/social/music/69-mpd.js b/social/music/69-mpd.js
index 1bec714a..a93b37ec 100644
--- a/social/music/69-mpd.js
+++ b/social/music/69-mpd.js
@@ -21,15 +21,13 @@ var komponist = require('komponist');
 var mpc = null;
 exec("which mpd",function(err,stdout,stderr) {
     if (stdout.indexOf('mpd') == -1) {
-        util.log('[69-mpd.js] Error: Cannot find "mpd" command. Please install MPD.');
-        return;
+        throw 'Error: Cannot find "mpd" command. Please install MPD.';
     }
 });
 
 exec("netstat -an | grep LISTEN | grep 6600",function(err,stdout,stderr) {
     if (stdout.indexOf('6600') == -1) {
-        util.log('[69-mpd.js] Warning: MPD daemon not listening on port 6600. Please start MPD.');
-        return;
+        throw '[69-mpd.js] Error: MPD daemon not listening on port 6600. Please start MPD.';
     }
     komponist.createConnection(6600, 'localhost', function(err, client) {
         if (err) node.error("MPD: Failed to connect to MPD server");
@@ -46,19 +44,18 @@ function MPDOut(n) {
     if (mpc != null) {
         this.on("input", function(msg) {
             if (msg != null) {
-                console.log(msg);
                 try {
                     //node.mpc.command(msg.payload);
                     node.mpc.command(msg.payload, msg.param, function(err, results) {
-                        if (err) { console.log("MPD: Error:",err); }
+                        if (err) { node.log("error: "+err); }
                         //else { console.log(results); }
                     });
-                } catch (err) { console.log("MPD: Error:",err); }
+                } catch (err) { node.log("error: "+err); }
             }
         });
 
         node.mpc.on('error', function(err) {
-            console.log("MPD: Error:",err);
+            node.log("error: "+err);
         });
     }
     else { node.warn("MPD not running"); }
@@ -76,7 +73,7 @@ function MPDIn(n) {
 
         function getSong() {
             node.mpc.currentsong(function(err, info) {
-                if (err) console.log(err);
+                if (err) node.log(err);
                 else {
                     var msg = {payload:{},topic:"music"};
                     msg.payload.Artist = info.Artist;