@capgo/native-audio 6.4.21 → 6.4.23

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) COPYRIGHT_YEAR COPYRIGHT_HOLDER
+Copyright (c) 2022 Capgo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/android/src/main/java/ee/forgr/audio/AudioAsset.java

@@ -13,6 +13,7 @@ public class AudioAsset {
   private int playIndex = 0;
   private final String assetId;
   protected final NativeAudio owner;
+  protected AudioCompletionListener completionListener;
 
   AudioAsset(
     NativeAudio owner,
@@ -167,4 +168,14 @@ public class AudioAsset {
 
     return audioList.get(playIndex).isPlaying();
   }
+
+  public void setCompletionListener(AudioCompletionListener listener) {
+    this.completionListener = listener;
+  }
+
+  protected void notifyCompletion() {
+    if (completionListener != null) {
+      completionListener.onCompletion(this.assetId);
+    }
+  }
 }

package/android/src/main/java/ee/forgr/audio/AudioCompletionListener.java

@@ -0,0 +1,5 @@
+package ee.forgr.audio;
+
+public interface AudioCompletionListener {
+  void onCompletion(String assetId);
+}

package/android/src/main/java/ee/forgr/audio/AudioDispatcher.java

@@ -118,7 +118,7 @@ public class AudioDispatcher
         this.stop();
 
         if (this.owner != null) {
-          this.owner.dispatchComplete();
+          this.owner.notifyCompletion();
         }
       }
     } catch (Exception ex) {

package/android/src/main/java/ee/forgr/audio/NativeAudio.java

@@ -504,6 +504,7 @@ public class NativeAudio
               audioChannelNum,
               volume
             );
+            remoteAudioAsset.setCompletionListener(this::dispatchComplete);
             audioAssetList.put(audioId, remoteAudioAsset);
           } else if (
             uri.getScheme() != null && uri.getScheme().equals("file")
@@ -535,6 +536,7 @@ public class NativeAudio
               audioChannelNum,
               volume
             );
+            asset.setCompletionListener(this::dispatchComplete);
             audioAssetList.put(audioId, asset);
           } else {
             throw new IllegalArgumentException(

package/android/src/main/java/ee/forgr/audio/RemoteAudioAsset.java

@@ -45,6 +45,9 @@ public class RemoteAudioAsset extends AudioAsset {
         isPrepared = true;
         Log.d(TAG, "MediaPlayer prepared for " + uri.toString());
       });
+      mediaPlayer.setOnCompletionListener(mp -> {
+        notifyCompletion();
+      });
       mediaPlayer.setOnErrorListener((mp, what, extra) -> {
         Log.e(TAG, "MediaPlayer error: " + what + ", " + extra);
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-audio",
-  "version": "6.4.21",
+  "version": "6.4.23",
   "description": "A native plugin for native audio engine",
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",