Skip to content

Commit 033c4af

Browse files
MrServoHains
MrServo
authored and
Hains
committed
[LCD4linux] V5.0-r35 photoframe "Samsung SPF-800W 800x600" added
- improvement: optimization of image transfer to Samsung picture frames - improvement: added support for photoframe "Samsung SPF-800W 800x600" - some AUTOPEP8 corrections (mainly commentary lines) THX to User **KenTucky @ OpenA.TV** details see: www.opena.tv/viewtopic.php?p=590972#p590966 HINT: **LCD4linux** is still working under Python2 and Python3
1 parent 9ecc2cc commit 033c4af

File tree

2 files changed

+55
-46
lines changed

2 files changed

+55
-46
lines changed

‎lcd4linux/src/Photoframe.py‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from usb.util import get_string
66
from PIL import Image
77
from struct import pack
8-
from six import ensure_binary
98
from six.moves import cStringIO as StringIO
109

1110

@@ -19,66 +18,74 @@ def write_jpg2frame(dev, pic):
1918
tdata = rawdata + b'\xff\x00' + pad * b'\x00'
2019
# Syntax: write(self, endpoint, data, interface = None, timeout = None):
2120
endpoint = 0x02
22-
dev.write(endpoint, tdata)
21+
# send to device in packages of = 2^16
22+
psize = 65536
23+
for p in range(int(len(tdata) / psize)):
24+
pdata = tdata[p * psize:(p + 1) * psize]
25+
dev.write(endpoint, pdata)
2326

2427

2528
def get_known_devices():
2629
# Return a dict of photo frames
2730
dlist = []
2831
# listed as: Name, idVendor, idProduct, [width , height - in pixel if applicable]
2932

30-
#0,1 Samsung SPF-75H/76H (23)
33+
# 0,1 Samsung SPF-75H/76H (23)
3134
dlist.append({'name': "SPF75H/76H Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x200f, 'width': 800, 'height': 480})
3235
dlist.append({'name': "SPF75H/76H Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x200e})
3336

34-
#2,3 Samsung SPF-87H (24)
37+
# 2,3 Samsung SPF-87H (24)
3538
dlist.append({'name': "SPF87H Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2034, 'width': 800, 'height': 480})
3639
dlist.append({'name': "SPF87H Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2033})
3740

38-
#4,5 Samsung SPF-87Hold (25)
41+
# 4,5 Samsung SPF-87Hold (25)
3942
dlist.append({'name': "SPF87Hold Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2026, 'width': 800, 'height': 480})
4043
dlist.append({'name': "SPF87Hold Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2025})
4144

42-
#6,7 Samsung SPF-83H (26)
45+
# 6,7 Samsung SPF-83H (26)
4346
dlist.append({'name': "SPF83H Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x200d, 'width': 800, 'height': 600})
4447
dlist.append({'name': "SPF83H Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x200c})
4548

46-
#8,9 Samsung SPF-107H (27)
49+
# 8,9 Samsung SPF-107H (27)
4750
dlist.append({'name': "SPF107H Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2036, 'width': 1024, 'height': 600})
4851
dlist.append({'name': "SPF107H Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2035})
4952

50-
#10,11 Samsung SPF-105P (28)
53+
# 10,11 Samsung SPF-105P (28)
5154
dlist.append({'name': "SPF105P Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x201b, 'width': 1024, 'height': 600})
5255
dlist.append({'name': "SPF105P Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x201c})
5356

54-
#12,13 Samsung SPF-85H/86H (29)
57+
# 12,13 Samsung SPF-85H/86H (29)
5558
dlist.append({'name': "SPF85H/86H Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2013, 'width': 800, 'height': 600})
5659
dlist.append({'name': "SPF85H/86H Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2012})
5760

58-
#14,15 Samsung SPF-72H (210)
61+
# 14,15 Samsung SPF-72H (210)
5962
dlist.append({'name': "SPF72H Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x200b, 'width': 800, 'height': 480})
6063
dlist.append({'name': "SPF72H Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x200a})
6164

62-
#16,17 Samsung SPF-700T (211)
65+
# 16,17 Samsung SPF-700T (211)
6366
dlist.append({'name': "SPF700T Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2050, 'width': 800, 'height': 600})
6467
dlist.append({'name': "SPF700T Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x204f})
6568

66-
#18,19 Samsung SPF-85P/86P (212)
69+
# 18,19 Samsung SPF-85P/86P (212)
6770
dlist.append({'name': "SPF85P/86P Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2017, 'width': 800, 'height': 600})
6871
dlist.append({'name': "SPF85P/86P Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2016})
6972

70-
#20,21 Samsung SPF-107Hold (213)
73+
# 20,21 Samsung SPF-107Hold (213)
7174
dlist.append({'name': "SPF107Hold Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2028, 'width': 1024, 'height': 600})
7275
dlist.append({'name': "SPF107Hold Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2027})
7376

74-
#22,23 Samsung SPF-1000P (214)
77+
# 22,23 Samsung SPF-1000P (214)
7578
dlist.append({'name': "SPF1000P Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2040, 'width': 1024, 'height': 600})
7679
dlist.append({'name': "SPF1000P Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2039})
7780

78-
#24,25 Samsung SPF-800P (215)
81+
# 24,25 Samsung SPF-800P (215)
7982
dlist.append({'name': "SPF800P Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x2038, 'width': 800, 'height': 480})
8083
dlist.append({'name': "SPF800P Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x2037})
8184

85+
# 26,27 Samsung SPF-800W (216)
86+
dlist.append({'name': "SPF800W Mini Monitor", 'idVendor': 0x04e8, 'idProduct': 0x204c, 'width': 800, 'height': 600})
87+
dlist.append({'name': "SPF800W Mass Storage", 'idVendor': 0x04e8, 'idProduct': 0x204b})
88+
8289
# Amazon Fire 7 (9th Generation 2019)
8390
dlist.append({'name': "Amazon Fire 7 Mini Monitor", 'idVendor': 0x1949, 'idProduct': 0x03C3, 'width': 1024, 'height': 600})
8491
dlist.append({'name': "Amazon Fire 7 Mass Storage", 'idVendor': 0x1949, 'idProduct': 0x03C1})
@@ -115,7 +122,7 @@ def init_device(anzahl, device0, device1):
115122
dev = find_device(anzahl, device0, device1)
116123

117124
if dev is not None:
118-
## found it, trying to init it
125+
# found it, trying to init it
119126
print("[LCD4linux] Find frame device: %s" % dev)
120127
if dev.idProduct == device0["idProduct"]:
121128
print("[LCD4linux] init Device")
@@ -128,7 +135,7 @@ def init_device(anzahl, device0, device1):
128135
# may need to burn some time
129136
dev = find_device(anzahl, device0, device1)
130137
if dev is not None and dev.idProduct == device0["idProduct"]:
131-
#switching successful
138+
# switching successful
132139
break
133140
elif time() - ts > 3:
134141
print("[LCD4linux] switching failed. Ending program")
@@ -195,7 +202,7 @@ def main():
195202
dev = init_device(1, device0, device1)
196203
print("Frame is in Mini Monitor mode and initialized. Sending pictures now")
197204
image = Image.open("mypicture.jpg")
198-
#manipulations to consider:
205+
# manipulations to consider:
199206
# convert
200207
# thumbnail
201208
# rotate

‎lcd4linux/src/plugin.py‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
if find_library("usb-0.1") is not None or find_library("usb-1.0") is not None:
173173
print("[LCD4linux] libusb found :-)", getEnigmaVersionString())
174174
USBok = True
175-
Version = "V5.0-r34"
175+
Version = "V5.0-r35"
176176
L4LElist = L4Lelement()
177177
L4LdoThread = True
178178
LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/
@@ -310,11 +310,13 @@
310310
TimeSelect = [("1", _("5s")), ("2", _("10s")), ("3", _("15s")), ("4", _("20s")), ("6", _("30s")), ("8", _("40s")), ("10", _("50s")), ("12", _("1min")), ("24", _("2min")), ("36", _("3min")), ("48", _("4min")), ("60", _("5min")), ("120", _("10min")), ("240", _("20min")), ("360", _("30min")), ("720", _("60min")), ("1440", _("2h")), ("2160", _("3h")), ("3600", _("5h"))]
311311
LCDSelect = [("1", _("LCD 1")), ("2", _("LCD 2")), ("12", _("LCD 1+2")), ("3", _("LCD 3")), ("13", _("LCD 1+3")), ("23", _("LCD 2+3")), ("123", _("LCD 1+2+3"))]
312312
LCDSwitchSelect = [("0", _("LCD 1-3")), ("1", _("LCD 1")), ("2", _("LCD 2")), ("3", _("LCD 3"))]
313-
LCDType = [("11", _("Pearl (or compatible LCD) 320x240")), ("12", _("Pearl (or compatible LCD) 240x320")), ("121", _("Corby@Pearl 128x128")), ("122", _("AX206 (or compatible LCD) 480x320")), ("123", _("AX206 (or compatible LCD) 800x480")),
314-
("210", _("Samsung SPF-72H 800x480")), ("23", _("Samsung SPF-75H/76H 800x480")), ("24", _("Samsung SPF-87H 800x480")), ("25", _("Samsung SPF-87H old 800x480")), ("26", _("Samsung SPF-83H 800x600")),
315-
("29", _("Samsung SPF-85H/86H 800x600")), ("212", _("Samsung SPF-85P/86P 800x600")), ("28", _("Samsung SPF-105P 1024x600")), ("27", _("Samsung SPF-107H 1024x600")), ("213", _("Samsung SPF-107H old 1024x600")),
316-
("211", _("Samsung SPF-700T 800x600")), ("215", _("Samsung SPF-800P 800x480")), ("214", _("Samsung SPF-1000P 1024x600")), ("430", _("Internal TFT-LCD 400x240")), ("50", _("Internal Box-Skin-LCD")),
317-
("31", _("only Picture 320x240")), ("33", _("only Picture 800x480")), ("36", _("only Picture 800x600")), ("37", _("only Picture 1024x600")), ("320", _("only Picture Custom Size")), ("420", _("only Picture Custom Size 2"))]
313+
LCDType = [
314+
("11", _("Pearl (or compatible LCD) 320x240")), ("12", _("Pearl (or compatible LCD) 240x320")), ("121", _("Corby@Pearl 128x128")), ("122", _("AX206 (or compatible LCD) 480x320")), ("123", _("AX206 (or compatible LCD) 800x480")),
315+
("210", _("Samsung SPF-72H 800x480")), ("23", _("Samsung SPF-75H/76H 800x480")), ("24", _("Samsung SPF-87H 800x480")), ("25", _("Samsung SPF-87H old 800x480")), ("26", _("Samsung SPF-83H 800x600")),
316+
("29", _("Samsung SPF-85H/86H 800x600")), ("212", _("Samsung SPF-85P/86P 800x600")), ("28", _("Samsung SPF-105P 1024x600")), ("27", _("Samsung SPF-107H 1024x600")), ("213", _("Samsung SPF-107H old 1024x600")),
317+
("211", _("Samsung SPF-700T 800x600")), ("215", _("Samsung SPF-800P 800x480")), ("214", _("Samsung SPF-1000P 1024x600")), ("216", _("Samsung SPF-800W 800x600")), ("430", _("Internal TFT-LCD 400x240")), ("50", _("Internal Box-Skin-LCD")),
318+
("31", _("only Picture 320x240")), ("33", _("only Picture 800x480")), ("36", _("only Picture 800x600")), ("37", _("only Picture 1024x600")), ("320", _("only Picture Custom Size")), ("420", _("only Picture Custom Size 2"))
319+
]
318320
if PNGutilOK:
319321
LCDType.insert(14, ("930", _("Internal Vu+ Duo2 LCD 400x240")))
320322
xmlLCDType = [("96x64", _("96x64")), ("128x32", _("128x32")), ("128x64", _("128x64")), ("132x64", _("132x64")), ("220x176", _("220x176")), ("255x64", _("255x64")), ("400x240", _("400x240")), ("480x320", _("480x320")), ("700x390", _("720x405")), ("800x480", _("800x480"))]
@@ -2890,7 +2892,7 @@ def getResolution(t, r):
28902892
MAX_W, MAX_H = 240, 320
28912893
elif t[1:] in ["3", "4", "5", "10", "15"]:
28922894
MAX_W, MAX_H = 800, 480
2893-
elif t[1:] in ["6", "9", "11", "12"]:
2895+
elif t[1:] in ["6", "9", "11", "12", "16"]:
28942896
MAX_W, MAX_H = 800, 600
28952897
elif t[1:] in ["7", "8", "13", "14"]:
28962898
MAX_W, MAX_H = 1024, 600
@@ -5149,7 +5151,7 @@ def MailDecode(Sdecode):
51495151
try:
51505152
if mailserver is not None:
51515153
mailserver.select("inbox")
5152-
# typ, data = mailserver.search(None, '(SINCE "{date}")'.format(date=Date))
5154+
# typ, data = mailserver.search(None, '(SINCE "{date}")'.format(date=Date))
51535155
if str(LCD4linux.MailIMAPDays.value) == "0":
51545156
typ, data = mailserver.search(None, 'ALL')
51555157
else:
@@ -5743,8 +5745,8 @@ def SetList(self):
57435745
self.list1.append(getConfigListEntry(_("- Color"), LCD4linux.PopupColor))
57445746
self.list1.append(getConfigListEntry(_("- Background Color"), LCD4linux.PopupBackColor))
57455747
self.list1.append(getConfigListEntry(_("- Font"), LCD4linux.PopupFont))
5746-
# if LCD4linux.LCDType1.value[0] == "4" or LCD4linux.LCDType2.value[0] == "4":
5747-
# self.list1.append(getConfigListEntry(_("Internal TFT Active"), LCD4linux.LCDTFT))
5748+
# if LCD4linux.LCDType1.value[0] == "4" or LCD4linux.LCDType2.value[0] == "4":
5749+
# self.list1.append(getConfigListEntry(_("Internal TFT Active"), LCD4linux.LCDTFT))
57485750
self.list1.append(getConfigListEntry(_("Active Screen"), LCD4linux.ScreenActive))
57495751
self.list1.append(getConfigListEntry(_("Screen Switch Select - Screen"), LCD4linux.ScreenSwitch))
57505752
self.list1.append(getConfigListEntry(_("Screen Default after mode change - Screen"), LCD4linux.ScreenDefault))
@@ -5764,9 +5766,9 @@ def SetList(self):
57645766
self.list1.append(getConfigListEntry(_("Picture Sort"), LCD4linux.BilderSort))
57655767
self.list1.append(getConfigListEntry(_("Picture Directory Recursive"), LCD4linux.BilderRecursiv))
57665768
self.list1.append(getConfigListEntry(_("Picture Quality for Resizing"), LCD4linux.BilderQuality))
5767-
# self.list1.append(getConfigListEntry(_("Picture JPEG-Quality [%]"), LCD4linux.BilderJPEG))
5769+
# self.list1.append(getConfigListEntry(_("Picture JPEG-Quality [%]"), LCD4linux.BilderJPEG))
57685770
self.list1.append(getConfigListEntry(_("Picture Quick Update Time [s]"), LCD4linux.BilderQuick))
5769-
# self.list1.append(getConfigListEntry(_("Picture Quick JPEG-Quality [%]"), LCD4linux.BilderJPEGQuick))
5771+
# self.list1.append(getConfigListEntry(_("Picture Quick JPEG-Quality [%]"), LCD4linux.BilderJPEGQuick))
57705772
self.list1.append(getConfigListEntry(_("Picture Type [only Picture]"), LCD4linux.BilderTyp))
57715773
self.list1.append(getConfigListEntry(_("Background-Picture Type"), LCD4linux.BilderBackground))
57725774
self.list1.append(getConfigListEntry(_("Weather API"), LCD4linux.WetterApi))
@@ -5897,7 +5899,7 @@ def SetList(self):
58975899
self.list1.append(getConfigListEntry(_("MJPEG Stream LCD 3 enable"), LCD4linux.MJPEGenable3))
58985900
self.list1.append(getConfigListEntry(_("MJPEG Stream LCD 3 Port"), LCD4linux.MJPEGport3))
58995901
self.list1.append(getConfigListEntry(_("MJPEG Stream LCD 3 Virtual Brightness"), LCD4linux.MJPEGvirtbri3))
5900-
# self.list1.append(getConfigListEntry(_("MJPEG Boundary Mode"), LCD4linux.MJPEGMode))
5902+
# self.list1.append(getConfigListEntry(_("MJPEG Boundary Mode"), LCD4linux.MJPEGMode))
59015903
self.list1.append(getConfigListEntry(_("MJPEG Cycle"), LCD4linux.MJPEGCycle))
59025904
self.list1.append(getConfigListEntry(_("MJPEG Restart on Error"), LCD4linux.MJPEGRestart))
59035905
self.list1.append(getConfigListEntry(_("MJPEG Header Mode"), LCD4linux.MJPEGHeader))
@@ -8011,8 +8013,8 @@ def fileSelected(self, dir, dir1):
80118013
LCD4linux.MPTextFile.value = dirdir
80128014
elif sel == LCD4linux.MPCoverFile:
80138015
LCD4linux.MPCoverFile.value = dirdir
8014-
# elif sel == LCD4linux.MPCoverFile2:
8015-
# LCD4linux.MPCoverFile2.value = dirdir
8016+
# elif sel == LCD4linux.MPCoverFile2:
8017+
# LCD4linux.MPCoverFile2.value = dirdir
80168018
elif sel == LCD4linux.BildFile:
80178019
LCD4linux.BildFile.value = dirdir
80188020
elif sel == LCD4linux.Bild2File:
@@ -8492,7 +8494,7 @@ def __init__(self, session):
84928494
self.ExternalIP = getExternalIP()
84938495
self.timerlist = ""
84948496
self.pluginlist = ""
8495-
# self.onShow.append(self.ServiceChange)
8497+
# self.onShow.append(self.ServiceChange)
84968498
config.misc.standbyCounter.addNotifier(self.standbyQuery, initial_call=False)
84978499
getBilder()
84988500
self.Temp = GetTempSensor()
@@ -8622,10 +8624,10 @@ def getSonos(self):
86228624
return
86238625
if self.SonosSoCo is not None:
86248626
cti = self.SonosSoCo.get_current_transport_info()
8625-
# if LCD4linux.SonosON.value == True:
8626-
# cti = {u'current_transport_status': 'OK', u'current_transport_state': 'PLAYING', u'current_transport_speed': '1'}
8627-
# else:
8628-
# cti = {u'current_transport_status': 'OK', u'current_transport_state': 'STOPPED', u'current_transport_speed': '1'}
8627+
# if LCD4linux.SonosON.value == True:
8628+
# cti = {u'current_transport_status': 'OK', u'current_transport_state': 'PLAYING', u'current_transport_speed': '1'}
8629+
# else:
8630+
# cti = {u'current_transport_status': 'OK', u'current_transport_state': 'STOPPED', u'current_transport_speed': '1'}
86298631
self.SonosInfo = cti.get("current_transport_state", "STOPPED")
86308632
if self.SonosInfo != "PLAYING" or self.SonosSoCo.is_playing_tv:
86318633
if self.SonosRunning:
@@ -8638,8 +8640,8 @@ def getSonos(self):
86388640
else:
86398641
self.SonosTrack = self.SonosSoCo.get_current_track_info()
86408642
self.Lvol = self.SonosSoCo.volume
8641-
# self.SonosTrack = {u'album': 'Sehnsucht', u'artist': 'Rammstein', u'title': 'Eifersucht', u'uri': 'x-sonos-spotify:spotify%3atrack%3a4Ugp6Wu4hVXnbEKT3Nrka0?sid=9&flags=8224&sn=3', u'playlist_position': '10', u'duration': '0:03:35', u'position': '0:01:39', u'album_art': u'http://192.168.0.84:1400/getaa?s=1&u=x-sonos-spotify%3aspotify%253atrack%253a4Ugp6Wu4hVXnbEKT3Nrka0%3fsid%3d9%26flags%3d8224%26sn%3d3', u'metadata': '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"><item id="-1" parentID="-1" restricted="true"><res protocolInfo="sonos.com-spotify:*:audio/x-spotify:*" duration="0:03:35">x-sonos-spotify:spotify%3atrack%3a4Ugp6Wu4hVXnbEKT3Nrka0?sid=9&amp;flags=8224&amp;sn=3</res><r:streamContent></r:streamContent><upnp:albumArtURI>/getaa?s=1&amp;u=x-sonos-spotify%3aspotify%253atrack%253a4Ugp6Wu4hVXnbEKT3Nrka0%3fsid%3d9%26flags%3d8224%26sn%3d3</upnp:albumArtURI><dc:title>Eifersucht</dc:title><upnp:class>object.item.audioItem.musicTrack</upnp:class><dc:creator>Rammstein</dc:creator><upnp:album>Sehnsucht</upnp:album></item></DIDL-Lite>'}
8642-
if self.SonosRunning == False:
8643+
# self.SonosTrack = {u'album': 'Sehnsucht', u'artist': 'Rammstein', u'title': 'Eifersucht', u'uri': 'x-sonos-spotify:spotify%3atrack%3a4Ugp6Wu4hVXnbEKT3Nrka0?sid=9&flags=8224&sn=3', u'playlist_position': '10', u'duration': '0:03:35', u'position': '0:01:39', u'album_art': u'http://192.168.0.84:1400/getaa?s=1&u=x-sonos-spotify%3aspotify%253atrack%253a4Ugp6Wu4hVXnbEKT3Nrka0%3fsid%3d9%26flags%3d8224%26sn%3d3', u'metadata': '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"><item id="-1" parentID="-1" restricted="true"><res protocolInfo="sonos.com-spotify:*:audio/x-spotify:*" duration="0:03:35">x-sonos-spotify:spotify%3atrack%3a4Ugp6Wu4hVXnbEKT3Nrka0?sid=9&amp;flags=8224&amp;sn=3</res><r:streamContent></r:streamContent><upnp:albumArtURI>/getaa?s=1&amp;u=x-sonos-spotify%3aspotify%253atrack%253a4Ugp6Wu4hVXnbEKT3Nrka0%3fsid%3d9%26flags%3d8224%26sn%3d3</upnp:albumArtURI><dc:title>Eifersucht</dc:title><upnp:class>object.item.audioItem.musicTrack</upnp:class><dc:creator>Rammstein</dc:creator><upnp:album>Sehnsucht</upnp:album></item></DIDL-Lite>'}
8644+
if self.SonosRunning is False:
86438645
self.SonosSoCo = None
86448646
self.SonosRunning = True
86458647
isMediaPlayer = "sonos"
@@ -10392,7 +10394,7 @@ def getNumber(actservice): # actservice must be an instance of eServiceReferenc
1039210394
playable = not (service.flags & mask)
1039310395
if playable:
1039410396
number += 1
10395-
# L4logE(" ",service.getPath())
10397+
# L4logE(" ",service.getPath())
1039610398
if actbouquet:
1039710399
if actbouquet == bouquet and actservice == service:
1039810400
return number
@@ -12325,7 +12327,7 @@ def putProgress(workaround, draw, im):
1232512327
else:
1232612328
ms = 1
1232712329
font = ImageFont.truetype(ConfigFont, int(ConfigSize * ms) + 8, encoding='unic') # 5
12328-
# if self.Lpath and ":0:" not in self.Lpath and "//" not in self.Lpath: # Movie
12330+
# if self.Lpath and ":0:" not in self.Lpath and "//" not in self.Lpath: # Movie
1232912331
if self.Llength is not None and self.Llength[0] != -1:
1233012332
isVideoPlaying = 1
1233112333
try:
@@ -13914,7 +13916,7 @@ def getColor(c):
1391413916
if ConfigModule == "0":
1391513917
ConfigModule = ConfigModuleUser
1391613918
font = ImageFont.truetype(ConfigFont, ConfigSize, encoding='unic')
13917-
# font1 = ImageFont.truetype(ConfigFont, int(ConfigSize / 1.5), encoding='unic')
13919+
# font1 = ImageFont.truetype(ConfigFont, int(ConfigSize / 1.5), encoding='unic')
1391813920
font2 = ImageFont.truetype(ConfigFont, int(ConfigSize / 2), encoding='unic')
1391913921
font3 = ImageFont.truetype(ConfigFont, int(ConfigSize / 3), encoding='unic')
1392013922
font4 = ImageFont.truetype(ConfigFont, int(ConfigSize / 5), encoding='unic')
@@ -14462,7 +14464,7 @@ def Sync(L):
1446214464
L4Lkeys = sorted(L4LElist.get().keys())
1446314465
for E in L4Lkeys:
1446414466
CUR = L4LElist.get(E)
14465-
# L4logE("CUR: %s Active %s" % (CUR,ScreenActive[0]))
14467+
# L4logE("CUR: %s Active %s" % (CUR,ScreenActive[0]))
1446614468
LCD = str(CUR.get("Lcd", "1"))
1446714469
if getSA(int(LCD)) in str(CUR.get("Screen", "1")) and MODE in CUR.get("Mode", "On"):
1446814470
Typ = CUR.get("Typ", None)
@@ -14543,7 +14545,7 @@ def Lput4(LCD, SCR, FUNC, PARA):
1454314545
if not LCD4linux.Enable.value:
1454414546
return
1454514547
tt = time()
14546-
# L4logE("MP-Mode", isMediaPlayer)
14548+
# L4logE("MP-Mode", isMediaPlayer)
1454714549
L4log("creating LCD-Picture: %s" % ScreenActive)
1454814550
if isdir("%slcd4linux" % TMP) == False:
1454914551
try:
@@ -14571,7 +14573,7 @@ def Lput4(LCD, SCR, FUNC, PARA):
1457114573
self.SaveisMediaPlayer = isMediaPlayer
1457214574
isMediaPlayer = ""
1457314575
rmFile(MP3tmp)
14574-
# rmFile(GoogleCover)
14576+
# rmFile(GoogleCover)
1457514577
if self.SonosRunning:
1457614578
isMediaPlayer, logtext = ("sonos", "detected Sonos")
1457714579
elif self.YMCastRunning:

0 commit comments

Comments
 (0)