new commands: enalbe_device, and disable_device, (maybe these commands should be toggles instead of two seperate commands?)

also, on close device, close the shout connection

git-svn-id: https://svn.musicpd.org/mpd/trunk@2485 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 7 insertions, 1 deletions

diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 12ef8c968..414fcdfde 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -289,6 +289,10 @@ static void myShout_finishDriver(AudioOutput * audioOutput) {
 }
 
 static void myShout_closeDevice(AudioOutput * audioOutput) {
+	ShoutData * sd = (ShoutData *)audioOutput->data;
+
+	myShout_closeShoutConn(sd);
+
 	audioOutput->open = 0;
 }
 
@@ -376,7 +380,9 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
 	ShoutData * sd = (ShoutData *)audioOutput->data;
 	time_t t = time(NULL);
 
-	if(t - sd->lastAttempt < CONN_ATTEMPT_INTERVAL) {
+	if(sd->connAttempts!= 0 && 
+			(t - sd->lastAttempt) < CONN_ATTEMPT_INTERVAL) 
+	{
 		return -1;
 	}