@@ -143,11 +143,10 @@ def menu_connections(self, focusItem=None):
143
143
144
144
rebuildList = 0
145
145
self .dbusDevices = self .get_sinks ()
146
- for dbusDevice in self .dbusDevices :
146
+ if self .dbusDevices :
147
147
rebuildList = 1
148
148
oe .winOeMain .getControl (int (oe .listObject ['palist' ])).reset ()
149
149
self .clear_list ()
150
- break
151
150
152
151
fallbackSink = dbus_pulseaudio .core_get_property ('FallbackSink' )
153
152
@@ -177,7 +176,7 @@ def menu_connections(self, focusItem=None):
177
176
sinkName = bytearray (self .dbusDevices [dbusDevice ]['PropertyList' ]['device.description' ]).decode ().strip ('\x00 ' )
178
177
179
178
# fallback to the ugly name
180
- if sinkName == '' :
179
+ if not sinkName :
181
180
sinkName = self .dbusDevices [dbusDevice ]['Name' ]
182
181
183
182
for prop in properties :
@@ -196,7 +195,7 @@ def menu_connections(self, focusItem=None):
196
195
if rebuildList == 1 :
197
196
self .listItems [dbusDevice ] = oe .winOeMain .addConfigItem (sinkName , dictProperties , oe .listObject ['palist' ])
198
197
else :
199
- if self .listItems [dbusDevice ] != None :
198
+ if self .listItems [dbusDevice ] is not None :
200
199
self .listItems [dbusDevice ].setLabel (sinkName )
201
200
for dictProperty in dictProperties :
202
201
self .listItems [dbusDevice ].setProperty (dictProperty , dictProperties [dictProperty ])
@@ -206,7 +205,7 @@ def open_context_menu(self, listItem):
206
205
values = {}
207
206
if listItem is None :
208
207
listItem = oe .winOeMain .getControl (oe .listObject ['palist' ]).getSelectedItem ()
209
- if listItem .getProperty ('ActiveProfileName' ) != '' :
208
+ if listItem .getProperty ('ActiveProfileName' ):
210
209
values [1 ] = {
211
210
'text' : oe ._ (32505 ),
212
211
'action' : 'change_profile' ,
@@ -218,9 +217,9 @@ def open_context_menu(self, listItem):
218
217
}
219
218
items = []
220
219
actions = []
221
- for key in list ( values .keys () ):
222
- items .append (values [ key ] ['text' ])
223
- actions .append (values [ key ] ['action' ])
220
+ for key , value in values .items ( ):
221
+ items .append (value ['text' ])
222
+ actions .append (value ['action' ])
224
223
select_window = xbmcgui .Dialog ()
225
224
title = oe ._ (32012 )
226
225
result = select_window .select (title , items )
0 commit comments