Changeset 663 for trunk/StreamVision

Timestamp:

05/17/13 21:10:46 (12 years ago)

Author:

Nicholas Riley

Message:

StreamVision.py: Remove terminology workaround, no longer necessary
for current iTunes 10 or 11. Use new Apple Event exposed AirPlay
queries in iTunes 11.0.3 if available.

File:

• trunk/StreamVision/StreamVision.py (modified) (3 diffs)

trunk/StreamVision/StreamVision.py

@@ -14 +14 @@
 import scrape
 import HotKey
-import tunes # <https://github.com/abarnert/itunesterms>
 
 GROWL_APP_NAME = 'StreamVision'
@@ -82 +81 @@
     return name
 
-def iTunesApp(): return app(id='com.apple.iTunes', terms=tunes)
+def iTunesApp(): return app(id='com.apple.iTunes')
 def XTensionApp(): return app(creator='SHEx')
 def AmuaApp(): return app('Amua.app')
@@ -106 +105 @@
     if not HAVE_XTENSION:
         return False
+    try:
+        # A bit better in iTunes 11.0.3, but can't do this via an Apple
+        # Event descriptor; have to send multiple events
+        iTunes = iTunesApp()
+        return any(d.kind() != k.computer for d in it.current_AirPlay_devices())
+    except AttributeError:
+        pass
+
     systemEvents = app(id='com.apple.systemEvents')
     iTunesWindow = systemEvents.application_processes[u'iTunes'].windows[u'iTunes']