2 files changed, 24 insertions, 0 deletions

diff --git a/src/audio/player.c b/src/audio/player.c
index 9e026561..94bcd065 100644
--- a/src/audio/player.c
+++ b/src/audio/player.c
@@ -455,6 +455,8 @@ struct Impl_Player {
     iAVFAudioPlayer * avfPlayer; /* iOS */
 };
 
+static iPlayer *activePlayer_;
+
 iDefineTypeConstruction(Player)
 
 static size_t sampleSize_Player_(const iPlayer *d) {
@@ -655,8 +657,14 @@ void deinit_Player(iPlayer *d) {
 #if defined (iPlatformAppleMobile)
     if (d->avfPlayer) {
         delete_AVFAudioPlayer(d->avfPlayer);
+        if (activePlayer_ == d) {
+            clearNowPlayingInfo_iOS();
+        }
     }
 #endif
+    if (activePlayer_ == d) {
+        activePlayer_ = NULL;
+    }
 }
 
 iBool isStarted_Player(const iPlayer *d) {
@@ -724,6 +732,13 @@ void updateSourceData_Player(iPlayer *d, const iString *mimeType, const iBlock *
     unlock_Mutex(&input->mtx);
 }
 
+size_t sourceDataSize_Player(const iPlayer *d) {
+    lock_Mutex(&d->data->mtx);
+    const size_t size = size_Block(&d->data->data);
+    unlock_Mutex(&d->data->mtx);
+    return size;
+}
+
 iBool start_Player(iPlayer *d) {
     if (isStarted_Player(d)) {
         return iFalse;
@@ -732,6 +747,7 @@ iBool start_Player(iPlayer *d) {
     if (d->avfPlayer) {
         play_AVFAudioPlayer(d->avfPlayer);
         setNotIdle_Player(d);
+        activePlayer_ = d;
         return iTrue;
     }
 #endif
@@ -749,6 +765,7 @@ iBool start_Player(iPlayer *d) {
     d->decoder->gain = d->volume;
     SDL_PauseAudioDevice(d->device, SDL_FALSE);
     setNotIdle_Player(d);
+    activePlayer_ = d;
     return iTrue;
 }
 
@@ -882,3 +899,7 @@ iString *metadataLabel_Player(const iPlayer *d) {
     }
     return meta;
 }
+
+iPlayer *active_Player(void) {
+    return activePlayer_;
+}
diff --git a/src/audio/player.h b/src/audio/player.h
index 8753d811..ca307dc4 100644
--- a/src/audio/player.h
+++ b/src/audio/player.h
@@ -48,6 +48,7 @@ enum iPlayerTag {
 
 void    updateSourceData_Player (iPlayer *, const iString *mimeType, const iBlock *data,
                                  enum iPlayerUpdate update);
+size_t  sourceDataSize_Player   (const iPlayer *);
 
 iBool           start_Player            (iPlayer *);
 void            stop_Player             (iPlayer *);
@@ -67,3 +68,5 @@ float   	streamProgress_Player   (const iPlayer *); /* normalized 0...1 */
 
 uint32_t    idleTimeMs_Player       (const iPlayer *);
 iString *   metadataLabel_Player    (const iPlayer *);
+
+iPlayer *   active_Player           (void);