Tweaks to the new music annoucements

JudahGabriel · Dec 26, 2024 · 7f336fb · 7f336fb
1 parent 1067e97
commit 7f336fb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/Chavah.NetCore/wwwroot/js/Services/AudioPlayerService.ts b/Chavah.NetCore/wwwroot/js/Services/AudioPlayerService.ts
@@ -220,17 +220,7 @@ namespace BitShuva.Chavah {
             }
         }
 
-        private isPlayingAnnouncement(): boolean {
-            return !!this.audio.src && (this.audio.src.includes("/api/cdn") || this.audio.src.includes("/soundEffects/"));
-        }
-
         private erred(args: ErrorEvent) {
-            if (this.isPlayingAnnouncement()) {
-                // If we're playing an announcement, don't worry about it. Just play the next thing.
-                this.ended();
-                return;
-            }
-
             this.status.onNext(AudioStatus.Erred);
             const currentSong = this.song.getValue();
             const errorInfo: IAudioErrorInfo = {

diff --git a/Chavah.NetCore/wwwroot/js/Services/NewMusicAnnouncerService.ts b/Chavah.NetCore/wwwroot/js/Services/NewMusicAnnouncerService.ts
@@ -52,7 +52,7 @@ namespace BitShuva.Chavah {
                 // First play the announcement, "next up is new music..."
                 const newMusicAnnouncementCount = 6;
                 const randomNewMusicNumber = randomNumber(1, newMusicAnnouncementCount);
-                const newMusicUrl = `${this.homeViewModel.soundEffects}/new-music-${randomNewMusicNumber}.mp3`;
+                const newMusicUrl = `${this.homeViewModel.soundEffects}/new-music-${randomNewMusicNumber}x.mp3`;
                 this.audioPlayer.playNewUri(newMusicUrl);
             } else {
                 // Then play the actual new song and reset our state.