Checking in MenuTunes changes and adding plugin loading for Kent. Also requires...

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index b2f6e9e..e8736fa 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -13,6 +13,7 @@ Things to do:
 #import "StatusWindowController.h"
 
 @interface MenuTunes(Private)
 #import "StatusWindowController.h"
 
 @interface MenuTunes(Private)

+- (ITMTRemote *)loadRemote;

 - (void)updateMenu;
 - (void)rebuildUpcomingSongsMenu;
 - (void)rebuildPlaylistMenu;
 - (void)updateMenu;
 - (void)rebuildUpcomingSongsMenu;
 - (void)rebuildPlaylistMenu;


@@ -21,6 +22,8 @@ Things to do:
 - (NSString *)runScriptAndReturnResult:(NSString *)script;
 - (void)timerUpdate;
 - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
 - (NSString *)runScriptAndReturnResult:(NSString *)script;
 - (void)timerUpdate;
 - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;

+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+        onItem:(NSMenuItem *)item;

 
 @end
 
 
 @end
 


@@ -31,8 +34,17 @@ Things to do:
 #pragma mark INITIALIZATION METHODS
 /*************************************************************************/
 
 #pragma mark INITIALIZATION METHODS
 /*************************************************************************/
 

+- (id)init
+{
+    if ( ( self = [super init] ) ) {
+        remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
+    }
+    return self;
+}
+

 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {

+    currentRemote = [self loadRemote];

     asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
 
     [self registerDefaultsIfNeeded];
     asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
 
     [self registerDefaultsIfNeeded];


@@ -69,6 +81,41 @@ Things to do:
     // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]];
 }
 
     // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]];
 }
 

+- (ITMTRemote *)loadRemote
+{
+    NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
+
+    if (folderPath) {
+        NSArray      *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath];
+        NSEnumerator *enumerator     = [bundlePathList objectEnumerator];
+        NSString     *bundlePath;
+
+        while ( (bundlePath = [enumerator nextObject]) ) {
+            NSBundle* remoteBundle = [NSBundle bundleWithPath:bundlePath];
+
+            if (remoteBundle) {
+                Class remoteClass = [remoteBundle principalClass];
+
+                if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
+                    [remoteClass isKindOfClass:[NSObject class]]) {
+
+                    id remote = [remoteClass remote];
+                    [remoteArray addObject:remote];
+                }
+            }
+        }
+
+//      if ( [remoteArray count] > 0 ) {
+//          if ( [remoteArray count] > 1 ) {
+//              [remoteArray sortUsingSelector:@selector(sortAlpha:)];
+//          }
+//          [self loadModuleAccessUI]; //Comment out this line to disable remote visibility
+//      }
+    }
+    NSLog(@"%@", [remoteArray objectAtIndex:0]);
+    return [remoteArray objectAtIndex:0];
+}
+

 
 /*************************************************************************/
 #pragma mark -
 
 /*************************************************************************/
 #pragma mark -


@@ -177,18 +224,44 @@ Things to do:
     for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
         if ([item isEqualToString:@"Play/Pause"]) {
     for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
         if ([item isEqualToString:@"Play/Pause"]) {

+            KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"];

             playPauseMenuItem = [menu addItemWithTitle:@"Play"
             playPauseMenuItem = [menu addItemWithTitle:@"Play"

-                                                action:@selector(playPause:)
-                                         keyEquivalent:@""];
+                                    action:@selector(playPause:)
+                                    keyEquivalent:@""];

             [playPauseMenuItem setTarget:self];
             [playPauseMenuItem setTarget:self];

+            
+            if (tempCombo)
+            {
+                [self setKeyEquivalentForCode:[tempCombo keyCode]
+                    andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
+                [tempCombo release];
+            }

         } else if ([item isEqualToString:@"Next Track"]) {
         } else if ([item isEqualToString:@"Next Track"]) {

-            [[menu addItemWithTitle:@"Next Track"
-                             action:@selector(nextSong:)
-                      keyEquivalent:@""] setTarget:self];
+            KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"];
+            NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track"
+                                        action:@selector(nextSong:)
+                                        keyEquivalent:@""];
+            
+            [nextTrack setTarget:self];
+            if (tempCombo)
+            {
+                [self setKeyEquivalentForCode:[tempCombo keyCode]
+                    andModifiers:[tempCombo modifiers] onItem:nextTrack];
+                [tempCombo release];
+            }

         } else if ([item isEqualToString:@"Previous Track"]) {
         } else if ([item isEqualToString:@"Previous Track"]) {

-            [[menu addItemWithTitle:@"Previous Track"
-                             action:@selector(prevSong:)
-                      keyEquivalent:@""] setTarget:self];
+            KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"];
+            NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track"
+                                        action:@selector(prevSong:)
+                                        keyEquivalent:@""];
+            
+            [prevTrack setTarget:self];
+            if (tempCombo)
+            {
+                [self setKeyEquivalentForCode:[tempCombo keyCode]
+                    andModifiers:[tempCombo modifiers] onItem:prevTrack];
+                [tempCombo release];
+            }

         } else if ([item isEqualToString:@"Fast Forward"]) {
             [[menu addItemWithTitle:@"Fast Forward"
                              action:@selector(fastForward:)
         } else if ([item isEqualToString:@"Fast Forward"]) {
             [[menu addItemWithTitle:@"Fast Forward"
                              action:@selector(fastForward:)


@@ -275,16 +348,17 @@ Things to do:
                 if ([defaults boolForKey:@"showName"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
                 if ([defaults boolForKey:@"showName"]) {
                     [menu removeItemAtIndex:index + 1];
                 }

-                if (didHaveAlbumName) {
+                if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {

                     [menu removeItemAtIndex:index + 1];
                 }
                     [menu removeItemAtIndex:index + 1];
                 }

-                if (didHaveArtistName) {
+                if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {

                     [menu removeItemAtIndex:index + 1];
                 }
                 if ([defaults boolForKey:@"showTime"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
             }
                     [menu removeItemAtIndex:index + 1];
                 }
                 if ([defaults boolForKey:@"showTime"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
             }

+            

             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]
             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]


@@ -350,11 +424,11 @@ Things to do:
         }
         
         if ([defaults boolForKey:@"showArtist"]) {
         }
         
         if ([defaults boolForKey:@"showArtist"]) {

-            didHaveAlbumName = (([curArtistName length] > 0) ? YES : NO);
+            didHaveArtistName = (([curArtistName length] > 0) ? YES : NO);

         }
             
         if ([defaults boolForKey:@"showAlbum"]) {
         }
             
         if ([defaults boolForKey:@"showAlbum"]) {

-            didHaveArtistName = (([curAlbumName length] > 0) ? YES : NO);
+            didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);

         }
     }
 }
         }
     }
 }


@@ -754,7 +828,6 @@ isEqualToString:@"rewinding"]) {
     if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
     if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";

-        int lines = 1;

         
         if ([defaults boolForKey:@"showName"]) {
             if ([defaults boolForKey:@"showArtist"]) {
         
         if ([defaults boolForKey:@"showName"]) {
             if ([defaults boolForKey:@"showArtist"]) {


@@ -763,10 +836,6 @@ isEqualToString:@"rewinding"]) {
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];
             stringToShow = [stringToShow stringByAppendingString:@"\n"];
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];
             stringToShow = [stringToShow stringByAppendingString:@"\n"];

-            if ([trackName length] > 38) {
-                lines++;
-            }
-            lines++;

         }
         
         if ([defaults boolForKey:@"showAlbum"]) {
         }
         
         if ([defaults boolForKey:@"showAlbum"]) {


@@ -774,7 +843,6 @@ isEqualToString:@"rewinding"]) {
             if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];
             if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];

-                lines++;

             }
         }
         
             }
         }
         


@@ -782,7 +850,6 @@ isEqualToString:@"rewinding"]) {
             NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
             NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];

-                lines++;

             }
         }
         
             }
         }
         


@@ -799,7 +866,7 @@ isEqualToString:@"rewinding"]) {
         }
         
         statusController = [[StatusWindowController alloc] init];
         }
         
         statusController = [[StatusWindowController alloc] init];

-        [statusController setTrackInfo:stringToShow lines:lines];
+        [statusController setTrackInfo:stringToShow];

         [NSTimer scheduledTimerWithTimeInterval:3.0
                                     target:self
                                     selector:@selector(fadeAndCloseStatusWindow)
         [NSTimer scheduledTimerWithTimeInterval:3.0
                                     target:self
                                     selector:@selector(fadeAndCloseStatusWindow)


@@ -828,12 +895,12 @@ isEqualToString:@"rewinding"]) {
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }

-            [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance];
+            [statusController setUpcomingSongs:songs];

             [NSTimer scheduledTimerWithTimeInterval:3.0
             [NSTimer scheduledTimerWithTimeInterval:3.0

-                                             target:self
-                                           selector:@selector(fadeAndCloseStatusWindow)
-                                           userInfo:nil
-                                            repeats:NO];
+                        target:self
+                        selector:@selector(fadeAndCloseStatusWindow)
+                        userInfo:nil
+                        repeats:NO];

         }
     }
 }
         }
     }
 }


@@ -845,6 +912,168 @@ isEqualToString:@"rewinding"]) {
     statusController = nil;
 }
 
     statusController = nil;
 }
 

+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+        onItem:(NSMenuItem *)item
+{
+    unichar charcode = 'a';
+    int i;
+    long cocoaModifiers = 0;
+    static long carbonToCocoa[6][2] = 
+    {
+        { cmdKey, NSCommandKeyMask },
+        { optionKey, NSAlternateKeyMask },
+        { controlKey, NSControlKeyMask },
+        { shiftKey, NSShiftKeyMask },
+    };
+    
+    for (i = 0; i < 6; i++)
+    {
+        if (modifiers & carbonToCocoa[i][0])
+        {
+            cocoaModifiers += carbonToCocoa[i][1];
+        }
+    }
+    [item setKeyEquivalentModifierMask:cocoaModifiers];
+    
+    //Missing key combos for some keys. Must find them later.
+    switch (code)
+    {
+        case 36:
+        break;
+        
+        case 48:
+        break;
+        
+        case 49:
+        break;
+        
+        case 51:
+            charcode = NSDeleteFunctionKey;
+        break;        
+        case 53:
+        break;
+                
+        case 71:
+        break;
+        
+        case 76:
+        break;
+        
+        case 96:
+            charcode = NSF5FunctionKey;
+        break;
+        
+        case 97:
+            charcode = NSF6FunctionKey;
+        break;
+        
+        case 98:
+            charcode = NSF7FunctionKey;
+        break;
+        
+        case 99:
+            charcode = NSF3FunctionKey;
+        break;
+        
+        case 100:
+            charcode = NSF8FunctionKey;
+        break;
+        
+        case 101:
+            charcode = NSF9FunctionKey;
+        break;
+        
+        case 103:
+            charcode = NSF11FunctionKey;
+        break;
+        
+        case 105:
+            charcode = NSF3FunctionKey;
+        break;
+        
+        case 107:
+            charcode = NSF14FunctionKey;
+        break;
+        
+        case 109:
+            charcode = NSF10FunctionKey;
+        break;
+        
+        case 111:
+            charcode = NSF12FunctionKey;
+        break;
+        
+        case 113:
+            charcode = NSF13FunctionKey;
+        break;
+        
+        case 114:
+            charcode = NSInsertFunctionKey;
+        break;
+        
+        case 115:
+        break;
+        
+        case 116:
+            charcode = NSPageUpFunctionKey;
+        break;
+        
+        case 117:
+            charcode = NSDeleteFunctionKey;
+        break;
+        
+        case 118:
+            charcode = NSF4FunctionKey;
+        break;
+        
+        case 119:
+            charcode = NSEndFunctionKey;
+        break;
+        
+        case 120:
+            charcode = NSF2FunctionKey;
+        break;
+        
+        case 121:
+            charcode = NSPageDownFunctionKey;
+        break;
+        
+        case 122:
+            charcode = NSF1FunctionKey;
+        break;
+        
+        case 123:
+            charcode = NSLeftArrowFunctionKey;
+        break;
+        
+        case 124:
+            charcode = NSRightArrowFunctionKey;
+        break;
+        
+        case 125:
+            charcode = NSDownArrowFunctionKey;
+        break;
+        
+        case 126:
+            charcode = NSUpArrowFunctionKey;
+        break;
+    }
+    
+    if (charcode == 'a') {
+        unsigned long state;
+        long keyTrans;
+        char charCode;
+        Ptr kchr;
+        state = 0;
+        kchr = (Ptr) GetScriptVariable(smCurrentScript, smKCHRCache);
+        keyTrans = KeyTranslate(kchr, code, &state);
+        charCode = keyTrans;
+        [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]];
+    } else {
+        [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]];
+    }
+}
+

 /*************************************************************************/
 #pragma mark -
 #pragma mark NSApplication DELEGATE METHODS
 /*************************************************************************/
 #pragma mark -
 #pragma mark NSApplication DELEGATE METHODS


@@ -875,5 +1104,4 @@ isEqualToString:@"rewinding"]) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-
-@end
+@end
\ No newline at end of file