@clockworkdog/cogs-client 1.5.5 → 1.5.6

package/dist/AudioPlayer.js

@@ -95,7 +95,7 @@ class AudioPlayer {
                 .filter(([, { state }]) => state.type === 'pausing')
                 .map(([id]) => parseInt(id));
             pausedSoundIds.forEach((soundId) => {
-                log('Resuming paused clip', { soundId });
+                log('Resuming paused clip', soundId);
                 clipPlayer.player.play(soundId);
             });
             // Clips with pause requested no longer need to pause, they can continue playing now
@@ -106,7 +106,7 @@ class AudioPlayer {
             const newSoundIds = pausedSoundIds.length > 0 || pausingSoundIds.length > 0 || pauseRequestedSoundIds.length > 0 ? [] : [clipPlayer.player.play()];
             // Pausing clips are technically currently playing as far as Howler is concerned
             pausingSoundIds.forEach((soundId) => {
-                log('Stopping fade and resuming pausing clip', { soundId });
+                log('Stopping fade and resuming pausing clip', soundId);
                 // Stop the fade callback
                 clipPlayer.player.off('fade', undefined, soundId);
                 // Set loop property
@@ -135,7 +135,6 @@ class AudioPlayer {
                 // Non-preloaded clips don't yet have an HTML audio node
                 // so we need to set the audio output when it's playing
                 clipPlayer.player.once('play', () => {
-                    log('play() callback - setPlayerSinkId', { soundId });
                     setPlayerSinkId(clipPlayer.player, this.sinkId);
                 });
                 clipPlayer.player.once('stop', () => this.handleStoppedClip(path, playId, soundId), soundId);
@@ -152,12 +151,11 @@ class AudioPlayer {
                     loop,
                     volume,
                 };
-                log('CLIP -> play_requested');
+                log('CLIP -> play_requested', soundId);
                 // Once clip starts, check if it should actually be paused or stopped
                 // If not, then update state to 'playing'
                 clipPlayer.player.once('play', () => {
                     var _a;
-                    log('play() callback - update state', { soundId });
                     const clipState = (_a = clipPlayer.activeClips[soundId]) === null || _a === void 0 ? void 0 : _a.state;
                     if ((clipState === null || clipState === void 0 ? void 0 : clipState.type) === 'pause_requested') {
                         log('Clip started playing but should be paused', { path, soundId });
@@ -168,7 +166,7 @@ class AudioPlayer {
                         this.stopAudioClip(path, { fade: clipState.fade }, soundId, true);
                     }
                     else {
-                        log('CLIP -> playing');
+                        log('CLIP -> playing', soundId);
                         this.updateActiveAudioClip(path, soundId, (clip) => ({ ...clip, state: { type: 'playing' } }));
                     }
                 }, soundId);
@@ -178,7 +176,6 @@ class AudioPlayer {
                     clipPlayer.player.volume(0, soundId);
                     clipPlayer.player.mute(false, soundId);
                     clipPlayer.player.once('play', () => {
-                        log('play() callback - fade volume', { soundId });
                         fadeAudioPlayerVolume(clipPlayer.player, volume, fade * 1000, soundId);
                     }, soundId);
                 }
@@ -208,25 +205,25 @@ class AudioPlayer {
                             // Fade then pause
                             clipPlayer.player.once('fade', (soundId) => {
                                 clipPlayer.player.pause(soundId);
-                                log('CLIP -> paused (after fade)');
+                                log('CLIP -> paused (after fade)', soundId);
                                 this.updateActiveAudioClip(path, soundId, (clip) => ({ ...clip, state: { type: 'paused' } }));
                                 this.notifyClipStateListeners(clip.playId, path, 'paused');
                             }, soundId);
                             fadeAudioPlayerVolume(clipPlayer.player, 0, fade * 1000, soundId);
-                            log('CLIP -> pausing');
+                            log('CLIP -> pausing', soundId);
                             clip.state = { type: 'pausing' };
                         }
                         else {
                             // Pause now
                             clipPlayer.player.pause(soundId);
-                            log('CLIP -> paused');
+                            log('CLIP -> paused', soundId);
                             clip.state = { type: 'paused' };
                             this.notifyClipStateListeners(clip.playId, path, 'paused');
                         }
                     }
                     // Clip hasn't started playing yet, or has already had pause_requested (but fade may have changed so update here)
                     else if (clip.state.type === 'play_requested' || clip.state.type === 'pause_requested') {
-                        log('CLIP -> pause_requested');
+                        log('CLIP -> pause_requested', soundId);
                         clip.state = { type: 'pause_requested', fade };
                     }
                 }
@@ -236,9 +233,10 @@ class AudioPlayer {
         });
     }
     stopAudioClip(path, { fade }, onlySoundId, allowIfStopRequested) {
-        var _a, _b;
+        var _a, _b, _c;
+        log('Stop audio clip', { activeClips: (_a = this.audioClipPlayers[path]) === null || _a === void 0 ? void 0 : _a.activeClips });
         // No active clips to stop
-        if (Object.keys((_b = (_a = this.audioClipPlayers[path]) === null || _a === void 0 ? void 0 : _a.activeClips) !== null && _b !== void 0 ? _b : {}).length === 0) {
+        if (Object.keys((_c = (_b = this.audioClipPlayers[path]) === null || _b === void 0 ? void 0 : _b.activeClips) !== null && _c !== void 0 ? _c : {}).length === 0) {
             return;
         }
         this.updateAudioClipPlayer(path, (clipPlayer) => {
@@ -257,11 +255,16 @@ class AudioPlayer {
                             clipPlayer.player.off('fade', soundId);
                             fadeAudioPlayerVolume(clipPlayer.player, 0, fade * 1000, soundId);
                             // Set callback after starting new fade, otherwise it will fire straight away as the previous fade is cancelled
-                            clipPlayer.player.once('fade', (soundId) => clipPlayer.player.stop(soundId), soundId);
-                            log('CLIP -> stopping');
+                            clipPlayer.player.once('fade', (soundId) => {
+                                clipPlayer.player.loop(false, soundId);
+                                clipPlayer.player.stop(soundId), soundId;
+                            });
+                            log('CLIP -> stopping', soundId);
                             clip.state = { type: 'stopping' };
                         }
                         else {
+                            log('Stop clip', soundId);
+                            clipPlayer.player.loop(false, soundId);
                             clipPlayer.player.stop(soundId);
                         }
                     }
@@ -269,7 +272,7 @@ class AudioPlayer {
                     // or has pause_requested, but stop takes precedence
                     else if (clip.state.type === 'play_requested' || clip.state.type === 'pause_requested' || clip.state.type === 'stop_requested') {
                         log("Trying to stop clip which hasn't started playing yet", { path, soundId });
-                        log('CLIP -> stop_requested');
+                        log('CLIP -> stop_requested', soundId);
                         clip.state = { type: 'stop_requested', fade };
                     }
                 }
@@ -471,9 +474,8 @@ function setAudioPlayerVolume(howl, volume, soundId) {
 /**
  * Fade to audio volume
  *
- * This doesn't work on iOS (volume is read-only) so at least mute it if the volume is zero
+ * Note: This doesn't work on iOS (volume is read-only)
  */
 function fadeAudioPlayerVolume(howl, volume, fade, soundId) {
-    howl.mute(false, soundId);
     howl.fade(howl.volume(soundId), volume, fade, soundId);
 }