Fix a couple of bugs in iTunes plugin:

Sending event just after launch failed because the process cannot be resolved. Use the pid to target it directly. Some action where using the wrong bundle id to find iTunes.
manide · Jul 3, 2015 · 7c583d4 · 7c583d4
1 parent 13e1d73
commit 7c583d4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/SparkKit/SparkKit.xcodeproj/project.pbxproj b/SparkKit/SparkKit.xcodeproj/project.pbxproj
@@ -149,7 +149,7 @@
 		1BC6A8EC17061FE700E7EA12 /* WBImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BE316D80D3815C9005C3FB2 /* WBImageView.m */; };
 		1BC6A8ED17061FF300E7EA12 /* WBBezelItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BB983690D381ECC0074D18E /* WBBezelItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1BC6A8EE17061FF300E7EA12 /* WBBezelItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BB9836A0D381ECC0074D18E /* WBBezelItem.m */; };
-		1BC6A8EF17061FF300E7EA12 /* WBBezelItemContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BB9836B0D381ECC0074D18E /* WBBezelItemContent.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1BC6A8EF17061FF300E7EA12 /* WBBezelItemContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BB9836B0D381ECC0074D18E /* WBBezelItemContent.h */; };
 		1BC6A8F017061FF300E7EA12 /* WBBezelItemContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BB9836C0D381ECC0074D18E /* WBBezelItemContent.m */; };
 		1BC6A8F117061FF300E7EA12 /* WBNotificationWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BB9836D0D381ECC0074D18E /* WBNotificationWindow.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1BC6A8F217061FF300E7EA12 /* WBNotificationWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BB9836E0D381ECC0074D18E /* WBNotificationWindow.m */; };

diff --git a/SparkPlugins/iTunes/Headers/ITunesAESuite.h b/SparkPlugins/iTunes/Headers/ITunesAESuite.h
@@ -89,8 +89,11 @@ typedef enum {
 } ITunesTrackProperty;
 
 WB_INLINE
-OSStatus iTunesSendCommand(ITunesCommand command) {
-  return WBAESendSimpleEventToBundle(kiTunesBundleIdentifier, kiTunesSuite, command);
+OSStatus iTunesSendCommand(ITunesCommand command, pid_t pid) {
+  if (pid)
+    return WBAESendSimpleEventTo(pid, kiTunesSuite, command);
+  else
+    return WBAESendSimpleEventToBundle(kiTunesBundleIdentifier, kiTunesSuite, command);
 }
 
 WB_INLINE

diff --git a/SparkPlugins/iTunes/ITunesAction.m b/SparkPlugins/iTunes/ITunesAction.m
@@ -408,15 +408,15 @@ - (void)notifyLaunch {
 
 static
 NSRunningApplication *iTunesLaunch(NSWorkspaceLaunchOptions flags) {
-  NSURL *url = [[NSWorkspace sharedWorkspace] URLForApplicationWithBundleIdentifier:kiTunesActionBundleIdentifier];
+  NSURL *url = [[NSWorkspace sharedWorkspace] URLForApplicationWithBundleIdentifier:SPXCFToNSString(kiTunesBundleIdentifier)];
   return [[NSWorkspace sharedWorkspace] launchApplicationAtURL:url options:flags configuration:nil error:NULL];
 }
 
 - (SparkAlert *)performAction {
   SparkAlert *alert = nil;
   switch ([self iTunesAction]) {
     case kiTunesLaunch: {
-      NSRunningApplication *iTunes = [NSRunningApplication runningApplicationsWithBundleIdentifier:kiTunesActionBundleIdentifier].firstObject;
+      NSRunningApplication *iTunes = [NSRunningApplication runningApplicationsWithBundleIdentifier:SPXCFToNSString(kiTunesBundleIdentifier)].firstObject;
       if (!iTunes) {
         NSWorkspaceLaunchOptions flags = NSWorkspaceLaunchDefault;
         if (ia_iaFlags.hide)
@@ -427,8 +427,12 @@ - (SparkAlert *)performAction {
         if (ia_iaFlags.notify) {
           [self notifyLaunch];
         }
-        if (ia_iaFlags.autoplay)
-          iTunesSendCommand(kiTunesCommandPlay);
+        if (ia_iaFlags.autoplay) {
+          pid_t pid = iTunes.processIdentifier;
+          OSStatus err = iTunesSendCommand(kiTunesCommandPlay, pid);
+          if (noErr != err)
+            SPXLogError(@"play event failed: %d", err);
+        }
       } else if (!ia_iaFlags.background) {
         /* if not launch in background, bring to front */
         [iTunes activateWithOptions:NSApplicationActivateIgnoringOtherApps];
@@ -439,18 +443,18 @@ - (SparkAlert *)performAction {
       iTunesQuit();
       break;
     case kiTunesPlayPause: {
-      NSRunningApplication *iTunes = [NSRunningApplication runningApplicationsWithBundleIdentifier:kiTunesActionBundleIdentifier].firstObject;
+      NSRunningApplication *iTunes = [NSRunningApplication runningApplicationsWithBundleIdentifier:SPXCFToNSString(kiTunesBundleIdentifier)].firstObject;
       if (!iTunes) {
         if (ia_iaFlags.autorun) {
           /* Launch iTunes */
-          iTunesLaunch(NSWorkspaceLaunchDefault | NSWorkspaceLaunchWithoutActivation);
+          iTunes = iTunesLaunch(NSWorkspaceLaunchDefault | NSWorkspaceLaunchWithoutActivation);
           /* Display iTunes Icon */
           [self notifyLaunch];
           /* Send Play event*/
-          iTunesSendCommand(kiTunesCommandPlay);
+          iTunesSendCommand(kiTunesCommandPlay, iTunes.processIdentifier);
         }
       } else {
-        iTunesSendCommand(kiTunesCommandPlayPause);
+        iTunesSendCommand(kiTunesCommandPlayPause, iTunes.processIdentifier);
         [self displayInfoIfRunning];
       }
     }
@@ -459,15 +463,15 @@ - (SparkAlert *)performAction {
       alert = [self playPlaylist];
       break;
     case kiTunesNextTrack:
-      iTunesSendCommand(kiTunesCommandNextTrack);
+      iTunesSendCommand(kiTunesCommandNextTrack, 0);
       [self displayInfoIfNeeded];
       break;
     case kiTunesBackTrack:
-      iTunesSendCommand(kiTunesCommandPreviousTrack);
+      iTunesSendCommand(kiTunesCommandPreviousTrack, 0);
       [self displayInfoIfNeeded];
       break;
     case kiTunesStop:
-      iTunesSendCommand(kiTunesCommandStopPlaying);
+      iTunesSendCommand(kiTunesCommandStopPlaying, 0);
       break;
     case kiTunesShowTrackInfo:
       [self displayTrackNotification];

diff --git a/SparkPlugins/iTunes/ITunesActionPlugin.m b/SparkPlugins/iTunes/ITunesActionPlugin.m
@@ -329,7 +329,7 @@ - (NSArray *)playlists {
 NSURL *_iTunesGetLibraryPathFromPreferences(Boolean compat) {
   NSURL *path = nil;
   CFDataRef data = CFPreferencesCopyValue(CFSTR("alis:1:iTunes Library Location"),
-                                          CFSTR("com.apple.iTunes"),
+                                          kiTunesBundleIdentifier,
                                           kCFPreferencesCurrentUser,
                                           kCFPreferencesAnyHost);
   if (data) {

diff --git a/SparkPlugins/iTunes/ITunesVisualSetting.m b/SparkPlugins/iTunes/ITunesVisualSetting.m
@@ -36,6 +36,10 @@ - (id)init {
   return self;
 }
 
+- (void)dealloc {
+  [ia_info close];
+}
+
 - (IBAction)hide:(id)sender {
   [[ia_info window] close];
   [[ia_info window] setIgnoresMouseEvents:YES];
@@ -48,7 +52,7 @@ - (IBAction)hide:(id)sender {
 
 - (IBAction)show:(id)sender {
   [[ia_info window] setIgnoresMouseEvents:NO];
-  [ia_info showWindow:sender];
+  [ia_info.window orderFront:sender];
 
   [ibShow setTitle:NSLocalizedStringFromTableInBundle(@"Hide", nil, kiTunesActionBundle,
                                                       @"Hide/Show button * Visual settings *")];

diff --git a/WonderBox b/WonderBox
+5 −10		Sources/BezelItem/WBBezelItem.h
+48 −50		Sources/BezelItem/WBBezelItem.m
+5 −6		Sources/BezelItem/WBBezelItemContent.h
+49 −66		Sources/BezelItem/WBBezelItemContent.m
+2 −12		Sources/BezelItem/WBNotificationWindow.h
+74 −76		Sources/BezelItem/WBNotificationWindow.m