Fix compile errors on LLVM/Clang.
authorKent Sutherland <ksuther@ithinksw.com>
Sat, 2 Jan 2010 03:32:03 +0000 (22:32 -0500)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Sat, 2 Jan 2010 03:40:00 +0000 (22:40 -0500)
ITMTRemote.m
MainController.m

index 8431051..9a720c4 100755 (executable)
 
 - (ITMTRemotePlayerRunningState)playerRunningState
 {
 
 - (ITMTRemotePlayerRunningState)playerRunningState
 {
-    return nil;
+    return ITMTRemotePlayerNotRunning;
 }
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {
 }
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {
-    return nil;
+    return ITMTRemotePlayerStopped;
 }
 
 - (NSArray *)playlists
 }
 
 - (NSArray *)playlists
 
 - (int)numberOfSources
 {
 
 - (int)numberOfSources
 {
-    return nil;
+    return -1;
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
-    return nil;
+    return -1;
 }
 
 - (ITMTRemotePlayerSource)currentSource
 {
 }
 
 - (ITMTRemotePlayerSource)currentSource
 {
-    return nil;
+    return ITMTRemoteLibrarySource;
 }
 
 - (int)currentSourceIndex
 {
 }
 
 - (int)currentSourceIndex
 {
-    return nil;
+    return -1;
 }
 
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {
 }
 
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {
-    return nil;
+    return ITMTRemotePlayerLibraryPlaylist;
 }
 
 - (int)currentPlaylistIndex
 {
 }
 
 - (int)currentPlaylistIndex
 {
-    return nil;
+    return -1;
 }
 
 - (NSString *)songTitleAtIndex:(int)index
 }
 
 - (NSString *)songTitleAtIndex:(int)index
 
 - (BOOL)songEnabledAtIndex:(int)index
 {
 
 - (BOOL)songEnabledAtIndex:(int)index
 {
-       return nil;
+       return NO;
 }
 
 - (int)currentAlbumTrackCount
 {
 }
 
 - (int)currentAlbumTrackCount
 {
-    return nil;
+    return -1;
 }
 
 - (int)currentSongTrack
 {
 }
 
 - (int)currentSongTrack
 {
-    return nil;
+    return -1;
 }
 
 - (NSString *)playerStateUniqueIdentifier
 }
 
 - (NSString *)playerStateUniqueIdentifier
 
 - (int)currentSongIndex
 {
 
 - (int)currentSongIndex
 {
-    return nil;
+    return -1;
 }
 
 - (NSString *)currentSongTitle
 }
 
 - (NSString *)currentSongTitle
 
 - (int)currentSongPlayCount
 {
 
 - (int)currentSongPlayCount
 {
-    return nil;
+    return 0;
 }
 
 - (float)currentSongRating
 {
 }
 
 - (float)currentSongRating
 {
-    return nil;
+    return 0;
 }
 
 - (BOOL)setCurrentSongRating:(float)rating
 }
 
 - (BOOL)setCurrentSongRating:(float)rating
 
 - (int)currentEQPresetIndex
 {
 
 - (int)currentEQPresetIndex
 {
-    return nil;
+    return 0;
 }
 
 - (float)volume
 {
 }
 
 - (float)volume
 {
-    return nil;
+    return 0;
 }
 
 - (BOOL)setVolume:(float)volume
 }
 
 - (BOOL)setVolume:(float)volume
index 7fe136e..7496d23 100755 (executable)
@@ -274,7 +274,7 @@ static MainController *sharedController;
 
 - (BOOL)radioIsPlaying
 {
 
 - (BOOL)radioIsPlaying
 {
-    ITMTRemotePlayerPlaylistClass class = nil;
+    ITMTRemotePlayerPlaylistClass class = ITMTRemotePlayerLibraryPlaylist;
     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER
     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER
@@ -380,7 +380,7 @@ static MainController *sharedController;
                                        _audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
                                        [_audioscrobblerTimer invalidate];
                                        [_audioscrobblerTimer release];
                                        _audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
                                        [_audioscrobblerTimer invalidate];
                                        [_audioscrobblerTimer release];
-                                       _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:nil target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+                                       _audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
                                        [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
                                }
                        } else {
                                        [[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
                                }
                        } else {