Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 7fe136e..7496d23 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -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 {