Changeset 211

Timestamp:

01/29/06 22:59:56 (18 years ago)

Author:

Nicholas Riley

Message:

setup.py: use HotKey module (shared with LocationDo) instead of
_StreamVision module

HotKeymodule.c: the aforementioned module

StreamVision.py: use HotKey module instead of _StreamVision module.
Fix StreamVision.displayTrackInfo to not crash when iTunes jealously
hides the names of iTMS tracks from us. Switch track rating keys to
shift-F10/F11 to avoid conflicting with my preferred Expose/Dashboard
key bindings on my iBook.

Location:

trunk/StreamVision

Files:

• HotKeymodule.c (moved) (moved from trunk/StreamVision/_StreamVisionmodule.c ) (3 diffs)
• StreamVision.py (modified) (4 diffs)
• setup.py (modified) (1 diff)

trunk/StreamVision/HotKeymodule.c

@@ -13 +13 @@
 
 static PyObject
-*StreamVision_HotKeyAddress(PyObject *self, PyObject *args) {
+*HotKey_HotKeyAddress(PyObject *self, PyObject *args) {
   PyObject *v;
   if (!PyArg_ParseTuple(args, "O", &v))
@@ -24 +24 @@
 }
 
-static PyMethodDef _StreamVisionmodule_methods[] = {
-  {"HotKeyAddress", StreamVision_HotKeyAddress, METH_VARARGS,
+static PyMethodDef HotKeymodule_methods[] = {
+  {"HotKeyAddress", HotKey_HotKeyAddress, METH_VARARGS,
    "HotKeyAddress(_CarbonEvt.EventHotKeyRef) -> integer\n\n"
    "Return the address of the underlying EventHotKeyRef (passed as data1 in hot key NSEvents)."},
@@ -32 +32 @@
 
 PyMODINIT_FUNC
-init_StreamVision(void) {
-  (void)Py_InitModule("_StreamVision", _StreamVisionmodule_methods);
+initHotKey(void) {
+  (void)Py_InitModule("HotKey", HotKeymodule_methods);
 }

trunk/StreamVision/StreamVision.py

@@ -7 +7 @@
 from PyObjCTools import AppHelper
 from Carbon.CarbonEvt import RegisterEventHotKey, GetApplicationEventTarget
-from Carbon.Events import cmdKey
+from Carbon.Events import cmdKey, shiftKey
 import struct
 import scrape
-import _StreamVision
+import HotKey
 
 GROWL_APP_NAME = 'StreamVision'
@@ -75 +75 @@
     def displayTrackInfo(self):
         iTunes = iTunesApp()
-        if iTunes.player_state.get() == k.playing:
-            if iTunes.current_track.class_.get() == k.URL_track:
-                growlNotify(cleanStreamTitle(iTunes.current_stream_title.get()),
-                            cleanStreamTrackName(iTunes.current_track.name.get()))
-            else:
-                kw = {}
-                artwork = iTunes.current_track.artworks.get()
-                if artwork:
-                    kw['pictImage'] = artwork[0].data.get()
-                growlNotify(iTunes.current_track.name.get() + '  ' +
-                            '★' * (iTunes.current_track.rating.get() / 20),
-                            iTunes.current_track.album.get() + "\n" +
-                            iTunes.current_track.artist.get(),
-                            **kw)
-        else:
-            trackName = ''
-            if iTunes.current_track.class_.get() != k.Property:
-                trackName = iTunes.current_track.name.get()
-            growlNotify("iTunes is not playing.", trackName)
+
+        trackClass = iTunes.current_track.class_.get()
+        trackName = ''
+        if trackClass != k.Property:
+            trackName = iTunes.current_track.name.get()
+
+        if iTunes.player_state.get() != k.playing:
+            growlNotify('iTunes is not playing.', trackName)
+            return
+        if trackClass == k.URL_track:
+            growlNotify(cleanStreamTitle(iTunes.current_stream_title.get()),
+                        cleanStreamTrackName(trackName))
+            return
+        if trackClass == k.Property:
+           growlNotify('iTunes is playing.', '')
+           return
+        kw = {}
+        # XXX iTunes doesn't let you get artwork for shared tracks
+        if trackClass != k.shared_track:
+            artwork = iTunes.current_track.artworks.get()
+            if artwork:
+                kw['pictImage'] = artwork[0].data.get()
+        growlNotify(trackName + '  ' +
+                    '★' * (iTunes.current_track.rating.get() / 20),
+                    iTunes.current_track.album.get() + "\n" +
+                    iTunes.current_track.artist.get(),
+                    **kw)
 
     def goToSite(self):
@@ -110 +118 @@
                                         GetApplicationEventTarget(), 0)
         self.hotKeys.append(hotKeyRef)
-        self.hotKeyActions[_StreamVision.HotKeyAddress(hotKeyRef)] = func
+        self.hotKeyActions[HotKey.HotKeyAddress(hotKeyRef)] = func
 
     def incrementRatingBy(self, increment):
@@ -140 +148 @@
         self.registerHotKey(lambda: iTunesApp().previous_track(), 109) # F10
         self.registerHotKey(lambda: iTunesApp().next_track(), 103) # F11
-        self.registerHotKey(lambda: self.incrementRatingBy(-20), 109, cmdKey) # cmd-F10
-        self.registerHotKey(lambda: self.incrementRatingBy(20), 103, cmdKey) # cmd-F11
+        self.registerHotKey(lambda: self.incrementRatingBy(-20), 109, shiftKey) # shift-F10
+        self.registerHotKey(lambda: self.incrementRatingBy(20), 103, shiftKey) # shift-F11
         NSDistributedNotificationCenter.defaultCenter().addObserver_selector_name_object_(self, self.displayTrackInfo, 'com.apple.iTunes.playerInfo', None)
 

trunk/StreamVision/setup.py

@@ -17 +17 @@
 setup(
     app=["StreamVision.py"],
-    ext_modules=[Extension('_StreamVision',
-                           sources=['_StreamVisionmodule.c'],
+    ext_modules=[Extension('HotKey',
+                           sources=['HotKeymodule.c'],
                            extra_link_args=['-framework', 'Carbon'])],
     data_files=["English.lproj"],