From bbe52b4cf6a59c69f6deb01a7020c418a4adecef Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sun, 7 May 2017 21:18:23 +0200 Subject: [PATCH] Revert streaming on/off procedures changes. --- radio_class.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/radio_class.py b/radio_class.py index 34d7755..7cc2a9a 100755 --- a/radio_class.py +++ b/radio_class.py @@ -449,7 +449,6 @@ class Radio: # Icecast Streaming settings self.streaming = self.getStoredStreaming() if self.streaming: - self.streaming = False self.streamingOn() else: self.streamingOff() @@ -1401,27 +1400,26 @@ class Radio: # Switch on Icecast2 streaming def streamingOn(self): - if not self.streaming: - output_id = 2 - self.streaming = True - self.execCommand("service icecast2 start") - self.execCommand("service darkice start") - self.execMpcCommand("enable " + str(output_id)) - self.storeStreaming("on") - self.streamingStatus() + output_id = 2 + self.streaming = True + self.execCommand("service icecast2 start") + self.execCommand("service darkice start") + self.execMpcCommand("enable " + str(output_id)) + self.storeStreaming("on") + self.streamingStatus() + self.streammetadata = '' return self.streaming # Switch off Icecast2 streaming def streamingOff(self): - if self.streaming: - output_id = 2 - self.streaming = False - self.execMpcCommand("disable " + str(output_id)) - self.execCommand("service darkice stop") - self.execCommand("service icecast2 stop") - self.storeStreaming("off") - self.streamingStatus() - self.streammetadata = '' + output_id = 2 + self.streaming = False + self.execMpcCommand("disable " + str(output_id)) + self.execCommand("service darkice stop") + self.execCommand("service icecast2 stop") + self.storeStreaming("off") + self.streamingStatus() + self.streammetadata = '' return self.streaming # Display streaming status