Merge pull request #9 from brettpappas/patch-4

Better handling of resume/play function
tlenclos · Aug 5, 2016 · fa4ad8d · fa4ad8d
2 parents 74b1a30 + e079e9c
commit fa4ad8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ios/ReactNativeAudioStreaming.h b/ios/ReactNativeAudioStreaming.h
@@ -8,6 +8,7 @@
 
 @property (nonatomic, strong) STKAudioPlayer *audioPlayer;
 @property (nonatomic, readwrite) BOOL isPlayingWithOthers;
+@property (nonatomic, readwrite) NSString *lastUrlString;
 @property (nonatomic, retain) NSString *currentSong;
 
 - (void)play;

diff --git a/ios/ReactNativeAudioStreaming.m b/ios/ReactNativeAudioStreaming.m
@@ -28,6 +28,7 @@ - (ReactNativeAudioStreaming *)init
       [self registerAudioInterruptionNotifications];
       [self registerRemoteControlEvents];
       [self setNowPlayingInfo:true];
+      self.lastUrlString = @"";
 
       [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(tick:) userInfo:nil repeats:YES];
 
@@ -70,12 +71,13 @@ - (void)dealloc
    if (!self.audioPlayer) {
       return;
    }
-   if (self.audioPlayer.state == STKAudioPlayerStatePaused) {
+   if (self.audioPlayer.state == STKAudioPlayerStatePaused && [self.lastUrlString isEqualToString:streamUrl]) {
       [self.audioPlayer resume];
    } else {
       [self.audioPlayer play:streamUrl];
    }
-
+
+   self.lastUrlString = streamUrl;
    [self setNowPlayingInfo:true];
 }