Changeset 644 for trunk

Timestamp:

05/14/12 17:49:01 (13 years ago)

Author:

Nicholas Riley

Message:

StreamVision.py: Remove workaround for iTunes Store accessibility bug in older iTunes versions.

File:

• trunk/StreamVision/StreamVision.py (modified) (1 diff)

trunk/StreamVision/StreamVision.py

@@ -100 +100 @@
     systemEvents = app(id='com.apple.systemEvents')
     iTunesWindow = systemEvents.application_processes[u'iTunes'].windows[u'iTunes']
-    try:
-        remote_speakers = iTunesWindow.buttons[its.attributes['AXDescription'].value.beginswith(u'AirPlay')].title()
-    except CommandError:
-        # with iTunes Store visible, the query fails with errAENoSuchObject
-        for button in iTunesWindow.buttons():
-            try:
-                if button.attributes['AXDescription'].value().endswith('AirPlay'):
-                    remote_speakers = [button.title()]
-                    break
-            except CommandError:
-                pass
-        else:
-            return False # XXX shouldn't get here
+    remote_speakers = iTunesWindow.buttons[its.attributes['AXDescription'].value.beginswith(u'AirPlay')].title()
     return remote_speakers and remote_speakers[0] not in (None, k.missing_value)