From: Matthew Judy Date: Fri, 21 Feb 2003 15:18:40 +0000 (+0000) Subject: In Obj-C, the boolean data type is BOOL, not bool. This seems to be the only class... X-Git-Tag: v1.0~232 X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/62ce32fc935d82a28a4440d07536eae205bfb108 In Obj-C, the boolean data type is BOOL, not bool. This seems to be the only class that had that issue. --- diff --git a/MenuTunes.h b/MenuTunes.h index d4807fd..304b34d 100755 --- a/MenuTunes.h +++ b/MenuTunes.h @@ -32,10 +32,10 @@ //Used in updating the menu automatically NSTimer *refreshTimer; int trackInfoIndex, lastSongIndex; - bool isPlayingRadio; + BOOL isPlayingRadio; - bool isAppRunning; - bool didHaveAlbumName, didHaveArtistName; //Helper variable for creating the menu + BOOL isAppRunning; + BOOL didHaveAlbumName, didHaveArtistName; //Helper variable for creating the menu //For upcoming songs NSMenuItem *upcomingSongsItem; @@ -54,6 +54,7 @@ PreferencesController *prefsController; StatusWindowController *statusController; //Shows track info and upcoming songs. } + - (void)registerDefaultsIfNeeded; - (void)rebuildMenu; - (void)clearHotKeys; diff --git a/MenuTunes.m b/MenuTunes.m index cf5801b..1dd7df6 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -126,7 +126,7 @@ Things to do: { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; if (![defaults objectForKey:@"menu"]) { - bool found = NO; + BOOL found = NO; NSMutableDictionary *loginwindow; NSMutableArray *loginarray; int i; @@ -583,7 +583,7 @@ Things to do: int playlist = [currentRemote currentPlaylistIndex]; if (trackPlayingIndex != lastSongIndex) { - bool wasPlayingRadio = isPlayingRadio; + BOOL wasPlayingRadio = isPlayingRadio; isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; if (isPlayingRadio && !wasPlayingRadio) { int i; @@ -603,7 +603,7 @@ Things to do: else { if (playlist != [currentRemote currentPlaylistIndex]) { - bool wasPlayingRadio = isPlayingRadio; + BOOL wasPlayingRadio = isPlayingRadio; isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"]; if (isPlayingRadio && !wasPlayingRadio) { int i;