X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/a39da95b62217faccd6f43d22f20c5637cf10196..8a38563fa0999446b3c396a23c45c15f73a86c87:/MenuController.m diff --git a/MenuController.m b/MenuController.m index 0998e06..1c8dd90 100755 --- a/MenuController.m +++ b/MenuController.m @@ -21,7 +21,8 @@ - (NSMenu *)playlistsMenu; - (NSMenu *)eqMenu; - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers - onItem:(NSMenuItem *)item; + onItem:(id )item; +- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name; @end @implementation MenuController @@ -41,7 +42,7 @@ NSArray *menuArray = [defaults arrayForKey:@"menu"]; NSEnumerator *enumerator = [menuArray objectEnumerator]; NSString *nextObject; - NSMenuItem *tempItem; + id tempItem; NSEnumerator *itemEnum; ITHotKey *hotKey; NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys]; @@ -398,7 +399,7 @@ - (NSMenu *)menuForNoPlayer { NSMenu *menu = [[NSMenu alloc] initWithTitle:@""]; - NSMenuItem *tempItem; + id tempItem; ITDebugLog(@"Creating menu for when player isn't running."); NS_DURING ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]); @@ -430,7 +431,6 @@ - (void)rebuildSubmenus { ITDebugLog(@"Rebuilding all of the submenus."); - NS_DURING _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex]; _currentTrack = [[[MainController sharedController] currentRemote] currentSongIndex]; @@ -438,7 +438,6 @@ NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER - [_ratingMenu release]; [_upcomingSongsMenu release]; [_playlistsMenu release]; @@ -495,11 +494,9 @@ NS_ENDHANDLER ITDebugLog(@"Building \"Upcoming Songs\" menu."); - if (_currentPlaylist && !_playingRadio) { if (numSongs > 0) { int i; - for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong; @@ -508,7 +505,7 @@ NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER - NSMenuItem *songItem; + id songItem; ITDebugLog(@"Adding song: %@", curSong); songItem = [upcomingSongsMenu addItemWithTitle:curSong action:@selector(performUpcomingSongsMenuAction:) keyEquivalent:@""]; [songItem setTag:i]; @@ -531,7 +528,7 @@ { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; NSArray *playlists; - NSMenuItem *tempItem; + id tempItem; ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; int i; NS_DURING @@ -572,11 +569,14 @@ { NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""]; NSArray *playlists; - NSMenuItem *tempItem; + id tempItem; ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource]; int i, j; NS_DURING playlists = [[[MainController sharedController] currentRemote] playlists]; + /*playlists = [NSArray arrayWithObjects: + [NSArray arrayWithObjects:@"Library", [NSNumber numberWithInt:-1], @"Library", @"Playlist", nil], + [NSArray arrayWithObjects:@"Radio", [NSNumber numberWithInt:1], @"Radio", nil], nil];*/ NS_HANDLER [[MainController sharedController] networkError:localException]; NS_ENDHANDLER @@ -585,42 +585,47 @@ NSArray *curPlaylist = [playlists objectAtIndex:0]; NSString *name = [curPlaylist objectAtIndex:0]; ITDebugLog(@"Adding main source: %@", name); - for (i = 1; i < [curPlaylist count]; i++) { + for (i = 2; i < [curPlaylist count]; i++) { ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:i]); tempItem = [playlistsMenu addItemWithTitle:[curPlaylist objectAtIndex:i] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; - [tempItem setTag:i + 1]; + [tempItem setTag:i]; [tempItem setTarget:self]; } } + if ( (source == ITMTRemoteRadioSource) || ([playlists count] - 2 > 0) ) { + [playlistsMenu addItem:[NSMenuItem separatorItem]]; + } - [playlistsMenu addItem:[NSMenuItem separatorItem]]; + if (source == ITMTRemoteRadioSource) { + [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:@selector(performPlaylistMenuAction:) keyEquivalent:@""] setState:NSOnState]; + } - for (i = 1; i < [playlists count]; i++) { + for (i = 2; i < [playlists count]; i++) { NSArray *curPlaylist = [playlists objectAtIndex:i]; NSString *name = [curPlaylist objectAtIndex:0]; NSMenu *submenu = [[NSMenu alloc] init]; ITDebugLog(@"Adding source: %@", name); - for (j = 1; j < [curPlaylist count]; j++) { - ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:j]); - tempItem = [submenu addItemWithTitle:[curPlaylist objectAtIndex:j] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; - [tempItem setTag:(j * 1000) + (j + 1)]; - [tempItem setTarget:self]; + + if ( ([[curPlaylist objectAtIndex:i] intValue] == ITMTRemoteiPodSource) && [self iPodAtPathAutomaticallyUpdates:[curPlaylist objectAtIndex:j]]) ) { + ITDebugLog(@"Invalid iPod source."); + } else { + for (j = 2; j < [curPlaylist count]; j++) { + ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:j]); + tempItem = [submenu addItemWithTitle:[curPlaylist objectAtIndex:j] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""]; + [tempItem setTag:(i * 1000) + j]; + [tempItem setTarget:self]; + } + [[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[submenu autorelease]]; } - [[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[submenu autorelease]]; } - /*if (source == ITMTRemoteRadioSource) { - [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:NULL keyEquivalent:@""] setState:NSOnState]; - } else if (source == ITMTRemoteGenericDeviceSource) { - [[playlistsMenu addItemWithTitle:NSLocalizedString(@"genericDevice", @"Generic Device") action:NULL keyEquivalent:@""] setState:NSOnState]; - } else if (source == ITMTRemoteiPodSource) { - [[playlistsMenu addItemWithTitle:NSLocalizedString(@"iPod", @"iPod") action:NULL keyEquivalent:@""] setState:NSOnState]; - } else if (source == ITMTRemoteCDSource) { - [[playlistsMenu addItemWithTitle:NSLocalizedString(@"cd", @"CD") action:NULL keyEquivalent:@""] setState:NSOnState]; - } else if (source == ITMTRemoteSharedLibrarySource) { - [[playlistsMenu addItemWithTitle:NSLocalizedString(@"sharedLibrary", @"Shared Library") action:NULL keyEquivalent:@""] setState:NSOnState]; + + if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ){ + tempItem = [playlistsMenu itemAtIndex:(int)[[[MainController sharedController] currentRemote] currentSourceIndex] + [playlistsMenu numberOfItems] - 5]; + [tempItem setState:NSOnState]; + [[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; } else if (source == ITMTRemoteLibrarySource && _currentPlaylist) { [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState]; - }*/ + } ITDebugLog(@"Done Building \"Playlists\" menu"); return playlistsMenu; } @@ -629,7 +634,7 @@ { NSMenu *eqMenu = [[NSMenu alloc] initWithTitle:@""]; NSArray *eqPresets; - NSMenuItem *tempItem; + id tempItem; int i; NS_DURING @@ -757,7 +762,7 @@ } - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers - onItem:(NSMenuItem *)item + onItem:(id )item { unichar charcode = 'a'; int i; @@ -976,4 +981,37 @@ ITDebugLog(@"Done setting key equivalent on menu item: %@", [item title]); } +- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name +{ + NSArray *volumes = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths]; + NSEnumerator *volEnum = [volumes objectEnumerator]; + NSString *nextVolume; + + while ( (nextVolume = [volEnum nextObject]) ) { + if ([nextVolume rangeOfString:name options:nil range:NSMakeRange(0, [name length] - 1)].location != NSNotFound) { + NSFileHandle *handle; + NSData *data; + NSString *path = [nextVolume stringByAppendingPathComponent:@"/iPod_Control/iTunes/iTunesPrefs"]; + if ( ![[NSFileManager defaultManager] fileExistsAtPath:path] ) { + ITDebugLog(@"Error, path isn't an iPod! %@", path); + return NO; + } + handle = [NSFileHandle fileHandleForReadingAtPath:name]; + [handle seekToFileOffset:10]; + data = [handle readDataOfLength:1]; + if ( (*((unsigned char*)[data bytes]) == 0x00) ) { + ITDebugLog(@"iPod is manually updated. %@", path); + return NO; + } else if ( ( *((unsigned char*)[data bytes]) == 0x01 ) ) { + ITDebugLog(@"iPod is automatically updated. %@", path); + return YES; + } else { + ITDebugLog(@"Error! Value: %h Desc: %@ Path: %@", *((unsigned char*)[data bytes]), [data description], path); + return NO; + } + } + } + return NO; +} + @end \ No newline at end of file