mirror of
https://github.com/Pecusx/piradio-mini.git
synced 2026-05-20 22:33:44 +02:00
New option in radiod.conf
Added option for force streaming in 1 core raspberies (force_streaming=yes).
This commit is contained in:
@@ -69,6 +69,7 @@ class Configuration:
|
|||||||
bright = True # LCD high brightness (Pecus)
|
bright = True # LCD high brightness (Pecus)
|
||||||
media_update = False # always update media library (Pecus)
|
media_update = False # always update media library (Pecus)
|
||||||
pandora_available = False # is Pandora accout available ? (Pecus)
|
pandora_available = False # is Pandora accout available ? (Pecus)
|
||||||
|
force_streaming = False # If True, streaming is possible even on weak raspberries (1 core)
|
||||||
|
|
||||||
# Colours for Adafruit LCD
|
# Colours for Adafruit LCD
|
||||||
color = { 'OFF': 0x0, 'RED' : 0x1, 'GREEN' : 0x2, 'YELLOW' : 0x3,
|
color = { 'OFF': 0x0, 'RED' : 0x1, 'GREEN' : 0x2, 'YELLOW' : 0x3,
|
||||||
@@ -280,6 +281,12 @@ class Configuration:
|
|||||||
else: # (Pecus)
|
else: # (Pecus)
|
||||||
self.pandora_available = False # (Pecus)
|
self.pandora_available = False # (Pecus)
|
||||||
|
|
||||||
|
elif option == 'force_streaming': # option for streaming availablity on 1 core raspberries (Pecus)
|
||||||
|
if parameter == 'yes': # (Pecus)
|
||||||
|
self.force_streaming = True # (Pecus)
|
||||||
|
else: # (Pecus)
|
||||||
|
self.force_streaming = False # (Pecus)
|
||||||
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
msg = "Invalid option " + option + ' in section ' \
|
msg = "Invalid option " + option + ' in section ' \
|
||||||
@@ -459,6 +466,10 @@ class Configuration:
|
|||||||
def getPandoraAvailable(self): # (Pecus)
|
def getPandoraAvailable(self): # (Pecus)
|
||||||
return self.pandora_available # (Pecus)
|
return self.pandora_available # (Pecus)
|
||||||
|
|
||||||
|
# Get streaming flag (Pecus)
|
||||||
|
def getForceStreaming(self): # (Pecus)
|
||||||
|
return self.force_streaming # (Pecus)
|
||||||
|
|
||||||
# Get speech volume % of normal volume level
|
# Get speech volume % of normal volume level
|
||||||
def getSpeechVolume(self):
|
def getSpeechVolume(self):
|
||||||
return self.speech_volume
|
return self.speech_volume
|
||||||
@@ -529,6 +540,7 @@ if __name__ == '__main__':
|
|||||||
print "LCD high brightness:", config.getBright() # (Pecus)
|
print "LCD high brightness:", config.getBright() # (Pecus)
|
||||||
print "Always update media library:", config.getAlwaysUpdate() # (Pecus)
|
print "Always update media library:", config.getAlwaysUpdate() # (Pecus)
|
||||||
print "Pandora account available:", config.getPandoraAvailable() # (Pecus)
|
print "Pandora account available:", config.getPandoraAvailable() # (Pecus)
|
||||||
|
print "Streaming on 1 core raspberries:",config.getForceStreaming() # (Pecus)
|
||||||
if config.getStationNamesSource() is 1:
|
if config.getStationNamesSource() is 1:
|
||||||
sSource = "STREAM"
|
sSource = "STREAM"
|
||||||
else:
|
else:
|
||||||
|
|||||||
+1
-1
@@ -1485,7 +1485,7 @@ class Radio:
|
|||||||
# Check if icecast streaming installed and pocessor has more than 1 core
|
# Check if icecast streaming installed and pocessor has more than 1 core
|
||||||
def streamingAvailable(self):
|
def streamingAvailable(self):
|
||||||
fpath = "/usr/bin/icecast2"
|
fpath = "/usr/bin/icecast2"
|
||||||
return os.path.isfile(fpath) and os.access(fpath, os.X_OK) and (self.cores>1)
|
return os.path.isfile(fpath) and os.access(fpath, os.X_OK) and ((self.cores>1) or config.getForceStreaming())
|
||||||
|
|
||||||
# Store stram on or off in streaming file
|
# Store stram on or off in streaming file
|
||||||
def storeStreaming(self,onoff):
|
def storeStreaming(self,onoff):
|
||||||
|
|||||||
Reference in New Issue
Block a user