Changeset 667

Timestamp:

08/06/13 23:50:41 (11 years ago)

Author:

Nicholas Riley

Message:

StreamVision.py: Remove unused import; convert tabs to spaces; die on
logout so we don't keep restarting iTunes over and over again.

File:

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

trunk/StreamVision/StreamVision.py

@@ -16 +16 @@
 import httplib2
 import os
-import struct
 import scrape
 import HotKey
@@ -67 +66 @@
     url = session.region.firsttag('a')['href']
     if not url.startswith('http'):
-        url = 'http://www.radioparadise.com/rp2-' + url
-        return url
+        url = 'http://www.radioparadise.com/rp2-' + url
+        return url
 
 def cleanStreamTitle(title):
@@ -319 +318 @@
         systemEvents = app(id='com.apple.systemEvents')
         frontName = systemEvents.processes[its.frontmost == True][1].name()
-        if frontName == 'RealPlayer':
-            realPlayer = app(id='com.RealNetworks.RealPlayer')
-            if len(realPlayer.players()) > 0:
-                if realPlayer.players[1].state() == k.playing:
-                    realPlayer.pause()
-                else:
-                    realPlayer.play()
-                return
-        elif frontName == 'VLC':
-            app(id='org.videolan.vlc').play() # equivalent to playpause
-        else:
-            self.playPause(useStereo=False)
+        if frontName == 'RealPlayer':
+            realPlayer = app(id='com.RealNetworks.RealPlayer')
+            if len(realPlayer.players()) > 0:
+                if realPlayer.players[1].state() == k.playing:
+                    realPlayer.pause()
+                else:
+                    realPlayer.play()
+                return
+        elif frontName == 'VLC':
+            app(id='org.videolan.vlc').play() # equivalent to playpause
+        else:
+            self.playPause(useStereo=False)
 
     def nextTrack(self):
@@ -384 +383 @@
         self.registerHotKey(lambda: self.incrementRatingBy(20), 103, shiftKey) # shift-F11
         self.registerZoomWindowHotKey()
-        NSDistributedNotificationCenter.defaultCenter().addObserver_selector_name_object_(self, self.displayTrackInfo, 'com.apple.iTunes.playerInfo', None)
+
+        distributedNotificationCenter = NSDistributedNotificationCenter.defaultCenter()
+        distributedNotificationCenter.addObserver_selector_name_object_(self, self.displayTrackInfo, 'com.apple.iTunes.playerInfo', None)
+        distributedNotificationCenter.addObserver_selector_name_object_(self, self.terminate_, 'com.apple.logoutContinued', None)
         try:
             import HIDRemote