fix cleanups and initialisations

modules/apis/StreamingServiceApi.js

@@ -68,4 +68,9 @@ export class StreamingServiceApi
  return undefined;
  }
 
+ cleanupPlayer(ownerId, audioId)
+ {
+ return undefined;
+ }
+
 }

modules/apis/YouTubeApi.js

@@ -61,15 +61,23 @@ export class YouTubeApi extends StreamingServiceApi
 
  findOrCreatePlayer(ownerId, audioId, sourceId)
  {
- var player = this.getPlayerAt(`youtube-player-${ownerId}-${audioId}`);
+ let player = this.getPlayerAt(`youtube-player-${ownerId}-${audioId}`);
  if (player === null || player === undefined)
  {
  player = new YouTubePlayer(ownerId, audioId, sourceId);
- // display: none;
  $('body').append(`<div class="yt-player"><div id="${player.playerId}"></div></div>`);
- //player.createPlayer();
  }
  return player;
  }
 
+ cleanupPlayer(ownerId, audioId) 
+ {
+ let playerId = `youtube-player-${ownerId}-${audioId}`;
+ let player = this.getPlayerAt(playerId);
+ if (player) {
+ player.delete();
+ this.setPlayerAt(playerId, undefined);
+ }
+ }
+
 }

modules/apis/YouTubePlayer.js

@@ -240,10 +240,14 @@ export class YouTubePlayer
  {
  if (this.hasPlayer())
  {
+ if (this.isPlaying())
+ {
+ this.player.stopVideo();
+ }
  this.player.destroy();
  this.player = null;
  this.bPlayerReady = false;
- $(`#${this.playerId}`).parent().remove();
+ $(`div#${this.playerId}`).closest('div.yt-player').remove();
  }
  }
 

modules/patches/Playlist.js

@@ -11,6 +11,15 @@ Playlist.prototype.findOrCreatePlayer = function(sound) {
  return null;
 };
 
+Playlist.prototype.cleanupPlayer = function (sound) {
+ if (sound.flags.bIsStreamed && sound.flags.streamingApi !== undefined)
+ {
+ getApi(sound.flags.streamingApi).cleanupPlayer(
+ this.id, sound._id
+ );
+ }
+}
+
 /**
  * Set up the Howl object by calling the core AudioHelper utility
  * @param {Object} sound The PlaylistSound for which to create an audio object
@@ -24,7 +33,6 @@ overrideFunc(Playlist.prototype, '_createAudio', function(super_createAudio, sou
  super_createAudio.call(this, sound);
  return;
  }
- this.findOrCreatePlayer(sound);
 });
 
 overrideFunc(Playlist.prototype, 'playSound', function(super_playSound, sound)
@@ -35,12 +43,17 @@ overrideFunc(Playlist.prototype, 'playSound', function(super_playSound, sound)
  return;
  }
 
- const ytPlayer = this.findOrCreatePlayer(sound);
- console.log('playSound', sound.flags.streamingId, sound.playing);
- ytPlayer.setSourceId(sound.flags.streamingId);
- ytPlayer.setLoop(sound.repeat);
- ytPlayer.setVolume(sound.volume * game.settings.get("core", "globalPlaylistVolume"));
- ytPlayer.ensurePlaying(sound.playing);
+ if (sound.playing) {
+
+ let ytPlayer = this.findOrCreatePlayer(sound);
+ console.log('playSound', sound.flags.streamingId, sound.playing);
+ ytPlayer.setSourceId(sound.flags.streamingId);
+ ytPlayer.setLoop(sound.repeat);
+ ytPlayer.setVolume(sound.volume * game.settings.get("core", "globalPlaylistVolume"));
+ ytPlayer.ensurePlaying(sound.playing);
+ } else {
+ let ytPlayer = this.cleanupPlayer(sound);
+ }
 });
 
 overrideFunc(Playlist.prototype, '_onDeleteEmbeddedEntity', function(