From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sat, 2 Jan 2010 03:32:03 +0000 (-0500)
Subject: Fix compile errors on LLVM/Clang.
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/5d522e078c23fa6f309bf38b44c6090e05581f01

Fix compile errors on LLVM/Clang.
---

diff --git a/ITMTRemote.m b/ITMTRemote.m
index 8431051..9a720c4 100755
--- a/ITMTRemote.m
+++ b/ITMTRemote.m
@@ -66,12 +66,12 @@
 
 - (ITMTRemotePlayerRunningState)playerRunningState
 {
-    return nil;
+    return ITMTRemotePlayerNotRunning;
 }
 
 - (ITMTRemotePlayerPlayingState)playerPlayingState
 {
-    return nil;
+    return ITMTRemotePlayerStopped;
 }
 
 - (NSArray *)playlists
@@ -91,32 +91,32 @@
 
 - (int)numberOfSources
 {
-    return nil;
+    return -1;
 }
 
 - (int)numberOfSongsInPlaylistAtIndex:(int)index
 {
-    return nil;
+    return -1;
 }
 
 - (ITMTRemotePlayerSource)currentSource
 {
-    return nil;
+    return ITMTRemoteLibrarySource;
 }
 
 - (int)currentSourceIndex
 {
-    return nil;
+    return -1;
 }
 
 - (ITMTRemotePlayerPlaylistClass)currentPlaylistClass
 {
-    return nil;
+    return ITMTRemotePlayerLibraryPlaylist;
 }
 
 - (int)currentPlaylistIndex
 {
-    return nil;
+    return -1;
 }
 
 - (NSString *)songTitleAtIndex:(int)index
@@ -126,17 +126,17 @@
 
 - (BOOL)songEnabledAtIndex:(int)index
 {
-	return nil;
+	return NO;
 }
 
 - (int)currentAlbumTrackCount
 {
-    return nil;
+    return -1;
 }
 
 - (int)currentSongTrack
 {
-    return nil;
+    return -1;
 }
 
 - (NSString *)playerStateUniqueIdentifier
@@ -146,7 +146,7 @@
 
 - (int)currentSongIndex
 {
-    return nil;
+    return -1;
 }
 
 - (NSString *)currentSongTitle
@@ -206,12 +206,12 @@
 
 - (int)currentSongPlayCount
 {
-    return nil;
+    return 0;
 }
 
 - (float)currentSongRating
 {
-    return nil;
+    return 0;
 }
 
 - (BOOL)setCurrentSongRating:(float)rating
@@ -246,12 +246,12 @@
 
 - (int)currentEQPresetIndex
 {
-    return nil;
+    return 0;
 }
 
 - (float)volume
 {
-    return nil;
+    return 0;
 }
 
 - (BOOL)setVolume:(float)volume
diff --git a/MainController.m b/MainController.m
index 7fe136e..7496d23 100755
--- a/MainController.m
+++ b/MainController.m
@@ -274,7 +274,7 @@ static MainController *sharedController;
 
 - (BOOL)radioIsPlaying
 {
-    ITMTRemotePlayerPlaylistClass class = nil;
+    ITMTRemotePlayerPlaylistClass class = ITMTRemotePlayerLibraryPlaylist;
     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];
-					_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 {