From 206c5eaa1c59488b78e24ca7f5b54be9cd74e192 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 14 Nov 2022 00:22:01 -0500 Subject: [PATCH] Remove console logs --- .../sound/music/JukeboxPlaylistController.ts | 11 ++++------- src/nitro/sound/music/MusicController.ts | 15 --------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/nitro/sound/music/JukeboxPlaylistController.ts b/src/nitro/sound/music/JukeboxPlaylistController.ts index e1044840..184859a3 100644 --- a/src/nitro/sound/music/JukeboxPlaylistController.ts +++ b/src/nitro/sound/music/JukeboxPlaylistController.ts @@ -8,9 +8,9 @@ import { MusicPriorities } from './MusicPriorities'; export class JukeboxPlaylistController implements IPlaylistController { private _isPlaying = false; - private _entries:ISongInfo[]; + private _entries: ISongInfo[]; private _currentEntryId: number; - private _missingSongInfo:number[]; + private _missingSongInfo: number[]; private _playPosition: number; private _disposed: boolean = false; @@ -46,7 +46,6 @@ export class JukeboxPlaylistController implements IPlaylistController { const parser = event.getParser(); - console.log(((((('Received Now Playing message with: ' + parser.currentSongId) + ', ') + parser.nextSongId) + ', ') + parser.syncCount)); this._isPlaying = (parser.currentSongId !== -1); if(parser.currentSongId >= 0) @@ -70,7 +69,6 @@ export class JukeboxPlaylistController implements IPlaylistController { const parser = event.getParser(); - console.log(('Received Jukebox song disks (=playlist) message, length of playlist: ' + parser.songDisks.length)); this._entries = []; for(let i = 0; i < parser.songDisks.length; i++) { @@ -97,11 +95,10 @@ export class JukeboxPlaylistController implements IPlaylistController private onJukeboxPlayListFullMessageEvent(event: JukeboxPlayListFullMessageEvent): void { - console.log('Received jukebox playlist full message.'); Nitro.instance.soundManager.events.dispatchEvent(new PlayListStatusEvent(PlayListStatusEvent.PLUE_PLAY_LIST_FULL)); } - private onSongInfoReceivedEvent(songInfoEvent:SongInfoReceivedEvent):void + private onSongInfoReceivedEvent(songInfoEvent: SongInfoReceivedEvent): void { for(let i = 0; i < this.length; i++) { @@ -129,7 +126,7 @@ export class JukeboxPlaylistController implements IPlaylistController } } - public stopPlaying():void + public stopPlaying(): void { Nitro.instance.soundManager.musicController.stop(this.priority); this._currentEntryId = -1; diff --git a/src/nitro/sound/music/MusicController.ts b/src/nitro/sound/music/MusicController.ts index 2456d334..54a8b883 100644 --- a/src/nitro/sound/music/MusicController.ts +++ b/src/nitro/sound/music/MusicController.ts @@ -210,7 +210,6 @@ export class MusicController implements IMusicController public onSongLoaded(songId: number): void { - console.log(('Song loaded : ' + songId)); const priority = this.getTopRequestPriority(); if(priority >= 0) { @@ -229,7 +228,6 @@ export class MusicController implements IMusicController protected onTraxSongComplete(k: SoundManagerEvent): void { - console.log((('Song ' + k.id) + ' finished playing')); if(this.getSongIdPlayingAtPriority(this._priorityPlaying) === k.id) { if(((this.getTopRequestPriority() === this._priorityPlaying) && (this.getSongRequestCountAtPriority(this._priorityPlaying) == this._requestNumberPlaying))) @@ -279,7 +277,6 @@ export class MusicController implements IMusicController Nitro.instance.soundManager.events.dispatchEvent(new SongDiskInventoryReceivedEvent(SongDiskInventoryReceivedEvent.SDIR_SONG_DISK_INVENTORY_RECEIVENT_EVENT)); } } - console.log(('Received song info : ' + song.id)); } } @@ -313,7 +310,6 @@ export class MusicController implements IMusicController if(this._songRequestList.length === 0) return; Nitro.instance.communication.connection.send(new GetSongInfoMessageComposer(...this._songRequestList)); - console.log(('Requested song info\'s : ' + this._songRequestList)); this._songRequestList = []; } @@ -357,7 +353,6 @@ export class MusicController implements IMusicController public playSong(songId: number, priority: number, startPos: number = 0, playLength: number = 0, fadeInSeconds: number = 0.5, fadeOutSeconds: number = 0.5): boolean { - console.log(('Requesting ' + songId + ' for playing')); if(!this.addSongStartRequest(priority, songId, startPos, playLength, fadeInSeconds, fadeOutSeconds)) { return false; @@ -370,10 +365,6 @@ export class MusicController implements IMusicController { this.playSongObject(priority, songId); } - else - { - console.log(((('Higher priority song blocked playing. Stored song ' + songId) + ' for priority ') + priority)); - } return true; } @@ -391,12 +382,10 @@ export class MusicController implements IMusicController const songData: SongDataEntry = this.getSongDataEntry(songId); if(!songData) { - console.log((('WARNING: Unable to find song entry id ' + songId) + ' that was supposed to be loaded.')); return false; } if(_local_3) { - console.log(('Waiting previous song to stop before playing song ' + songId)); return true; } this._musicPlayer.setVolume(Nitro.instance.soundManager.traxVolume); @@ -407,8 +396,6 @@ export class MusicController implements IMusicController const songRequestData: SongStartRequestData = this.getSongStartRequest(priority); - console.log(songRequestData); - if(songRequestData) { startPos = songRequestData.startPos; @@ -445,7 +432,6 @@ export class MusicController implements IMusicController { Nitro.instance.soundManager.events.dispatchEvent(new NowPlayingEvent(NowPlayingEvent.NPE_USER_PLAY_SONG, priority, songData.id, -1)); } - console.log(((((((((('Started playing song ' + songId) + ' at position ') + startPos) + ' for ') + playLength) + ' seconds (length ') + (songData.length / 1000)) + ') with priority ') + priority)); return true; } @@ -552,7 +538,6 @@ export class MusicController implements IMusicController { const songData = this.getSongDataEntry(songIdAtPriority); //this.stopSongDataEntry(_local_3); - console.log('stopping song ' + songIdAtPriority); this._musicPlayer.stop(); return true; }