- (NSMenu *)playlistsMenu;
- (NSMenu *)eqMenu;
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
- onItem:(NSMenuItem *)item;
-//- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name;
+ onItem:(id <NSMenuItem>)item;
+- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name;
@end
@implementation MenuController
NSArray *menuArray = [defaults arrayForKey:@"menu"];
NSEnumerator *enumerator = [menuArray objectEnumerator];
NSString *nextObject;
- NSMenuItem *tempItem;
+ id <NSMenuItem> tempItem;
NSEnumerator *itemEnum;
ITHotKey *hotKey;
NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys];
}
}
+ if ([defaults boolForKey:@"showComposer"]) {
+ NSString *curComposer;
+ NS_DURING
+ curComposer = [[[MainController sharedController] currentRemote] currentSongComposer];
+ NS_HANDLER
+ [[MainController sharedController] networkError:localException];
+ NS_ENDHANDLER
+ ITDebugLog(@"Add Track Composer (\"%@\") menu item.", curComposer);
+ if ( curComposer ) {
+ [menu indentItem:
+ [menu addItemWithTitle:curComposer action:nil keyEquivalent:@""]];
+ }
+ }
+
if ([defaults boolForKey:@"showTrackNumber"]) {
int track;
NS_DURING
- (NSMenu *)menuForNoPlayer
{
NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
- NSMenuItem *tempItem;
+ id <NSMenuItem> tempItem;
ITDebugLog(@"Creating menu for when player isn't running.");
NS_DURING
ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]);
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
+ ITDebugLog(@"Releasing old submenus.");
[_ratingMenu release];
[_upcomingSongsMenu release];
[_playlistsMenu release];
if (_currentPlaylist && !_playingRadio) {
if (numSongs > 0) {
int i;
-
for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) {
if (i <= numSongs) {
NSString *curSong;
NS_HANDLER
[[MainController sharedController] networkError:localException];
NS_ENDHANDLER
- NSMenuItem *songItem;
+ id <NSMenuItem> songItem;
ITDebugLog(@"Adding song: %@", curSong);
songItem = [upcomingSongsMenu addItemWithTitle:curSong action:@selector(performUpcomingSongsMenuAction:) keyEquivalent:@""];
[songItem setTag:i];
return upcomingSongsMenu;
}
-- (NSMenu *)playlistsMenu
+/*- (NSMenu *)playlistsMenu
{
NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
NSArray *playlists;
- NSMenuItem *tempItem;
+ id <NSMenuItem> tempItem;
ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
int i;
NS_DURING
}
ITDebugLog(@"Done Building \"Playlists\" menu");
return playlistsMenu;
-}
+}*/
-/*- (NSMenu *)playlistsMenu
+- (NSMenu *)playlistsMenu
{
NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
NSArray *playlists;
- NSMenuItem *tempItem;
+ id <NSMenuItem> tempItem;
ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
int i, j;
+ NSMutableArray *indices = [[NSMutableArray alloc] init];
NS_DURING
playlists = [[[MainController sharedController] currentRemote] playlists];
NS_HANDLER
NSArray *curPlaylist = [playlists objectAtIndex:0];
NSString *name = [curPlaylist objectAtIndex:0];
ITDebugLog(@"Adding main source: %@", name);
- for (i = 2; i < [curPlaylist count]; i++) {
+ for (i = 3; i < [curPlaylist count]; i++) {
ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:i]);
tempItem = [playlistsMenu addItemWithTitle:[curPlaylist objectAtIndex:i] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""];
- [tempItem setTag:i];
+ [tempItem setTag:i - 1];
[tempItem setTarget:self];
}
+ ITDebugLog(@"Adding index to the index array.");
+ [indices addObject:[curPlaylist objectAtIndex:2]];
}
-
+ [indices addObject:[[playlists objectAtIndex:1] objectAtIndex:2]];
if ( (source == ITMTRemoteRadioSource) || ([playlists count] - 2 > 0) ) {
[playlistsMenu addItem:[NSMenuItem separatorItem]];
}
NSMenu *submenu = [[NSMenu alloc] init];
ITDebugLog(@"Adding source: %@", name);
- if ( ([[curPlaylist objectAtIndex:i] intValue] == ITMTRemoteiPodSource) && (![self iPodAtPathAutomaticallyUpdates:[curPlaylist objectAtIndex:j]]) ) {
+ if ( ([[curPlaylist objectAtIndex:1] intValue] == ITMTRemoteiPodSource) && [self iPodWithNameAutomaticallyUpdates:name] ) {
ITDebugLog(@"Invalid iPod source.");
+ [playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""];
} else {
- for (j = 2; j < [curPlaylist count]; j++) {
+ for (j = 3; 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 setTag:(i * 1000) + j - 1];
[tempItem setTarget:self];
}
[[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[submenu autorelease]];
}
+ ITDebugLog(@"Adding index to the index array.");
+ [indices addObject:[curPlaylist objectAtIndex:2]];
}
-
- if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ){
- tempItem = [playlistsMenu itemAtIndex:(int)[[[MainController sharedController] currentRemote] currentSourceIndex] + [playlistsMenu numberOfItems] - 5];
+ ITDebugLog(@"Checking the current source.");
+ if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ) {
+ tempItem = [playlistsMenu itemAtIndex:[playlistsMenu numberOfItems] + [indices indexOfObject:[NSNumber numberWithInt:[[[MainController sharedController] currentRemote] currentSourceIndex]]] - [indices count]];
[tempItem setState:NSOnState];
[[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
} else if (source == ITMTRemoteLibrarySource && _currentPlaylist) {
[[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
}
+ [indices release];
ITDebugLog(@"Done Building \"Playlists\" menu");
return playlistsMenu;
-}*/
+}
- (NSMenu *)eqMenu
{
NSMenu *eqMenu = [[NSMenu alloc] initWithTitle:@""];
NSArray *eqPresets;
- NSMenuItem *tempItem;
+ id <NSMenuItem> tempItem;
int i;
NS_DURING
}
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
- onItem:(NSMenuItem *)item
+ onItem:(id <NSMenuItem>)item
{
unichar charcode = 'a';
int i;
ITDebugLog(@"Done setting key equivalent on menu item: %@", [item title]);
}
-/*- (BOOL)iPodAtPathAutomaticallyUpdates:(NSString *)name
+- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name
{
NSArray *volumes = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths];
NSEnumerator *volEnum = [volumes objectEnumerator];
NSString *nextVolume;
-
+ ITDebugLog(@"Looking for an iPod named %@", name);
while ( (nextVolume = [volEnum nextObject]) ) {
- if ([nextVolume rangeOfString:name options:nil range:NSMakeRange(0, [name length] - 1)].location != NSNotFound) {
+ ITDebugLog(@"- %@", nextVolume);
+ 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"];
ITDebugLog(@"Error, path isn't an iPod! %@", path);
return NO;
}
- handle = [NSFileHandle fileHandleForReadingAtPath:name];
+ handle = [NSFileHandle fileHandleForReadingAtPath:path];
+ ITDebugLog(@"File handle: %@", handle);
[handle seekToFileOffset:10];
data = [handle readDataOfLength:1];
+ ITDebugLog(@"Data: %@", data);
if ( (*((unsigned char*)[data bytes]) == 0x00) ) {
ITDebugLog(@"iPod is manually updated. %@", path);
return NO;
}
}
}
-}*/
+ return YES;
+}
@end
\ No newline at end of file
git.ithinksw.org / MenuTunes.git / blobdiff