Make StopAllSounds do what the name implies, and not stop all audio i…

…nstead
Aleph-One-Marathon · Sep 26, 2024 · cb2a50a · cb2a50a
1 parent aec34eb
commit cb2a50a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Source_Files/Misc/interface.cpp b/Source_Files/Misc/interface.cpp
@@ -359,7 +359,7 @@ static void update_interface_fades(void);
 static void interface_fade_out(short pict_resource_number, bool fade_music);
 static bool can_interface_fade_out(void);
 static void transfer_to_new_level(short level_number);
-static void try_and_display_chapter_screen(short level, bool interface_table_is_valid, bool text_block, bool epilogue_screen);
+static void try_and_display_chapter_screen(short level, bool interface_table_is_valid, bool text_block);
 
 static screen_data *get_screen_data(
 	short index);
@@ -1710,7 +1710,7 @@ static void display_epilogue(
 		end_count = 2;
 	}
 	for (int i=0; i<end_count; i++)
-		try_and_display_chapter_screen(end_offset+i, true, true, true);
+		try_and_display_chapter_screen(end_offset+i, true, true);
 	show_cursor();
 }
 
@@ -2350,7 +2350,7 @@ static void transfer_to_new_level(
 			return;
 		}
 
-		if (!game_is_networked) try_and_display_chapter_screen(level_number, true, false, false);
+		if (!game_is_networked) try_and_display_chapter_screen(level_number, true, false);
 		success= goto_level(&entry, dynamic_world->player_count, nullptr);
 		set_keyboard_controller_status(true);
 	}
@@ -2647,7 +2647,7 @@ static bool begin_game(
 		{
 			FindLevelMovie(entry.level_number);
 			show_movie(entry.level_number);
-			try_and_display_chapter_screen(entry.level_number, false, false, false);
+			try_and_display_chapter_screen(entry.level_number, false, false);
 		}
 
 		Plugins::instance()->set_mode(number_of_players > 1 ? Plugins::kMode_Net : Plugins::kMode_Solo);
@@ -3225,8 +3225,7 @@ static void handle_interface_menu_screen_click(
 static void try_and_display_chapter_screen(
 	short level,
 	bool interface_table_is_valid,
-	bool text_block,
-	bool epilogue_screen)
+	bool text_block)
 {
 	if (Movie::instance()->IsRecording() || !shell_options.replay_directory.empty())
 		return;
@@ -3238,7 +3237,7 @@ static void try_and_display_chapter_screen(
 		short existing_state= game_state.state;
 		game_state.state= _display_chapter_heading;
 
-		if (!epilogue_screen) SoundManager::instance()->StopAllSounds(); //don't stop the music if intro restarted for epilogue
+		SoundManager::instance()->StopAllSounds();
 
 		/* This will NOT work if the initial level entered has a chapter screen, which is why */
 		/*  we perform this check. (The interface_color_table is not valid...) */

diff --git a/Source_Files/Sound/OpenALManager.h b/Source_Files/Sound/OpenALManager.h
@@ -54,7 +54,6 @@ class OpenALManager {
 	void Pause(bool paused);
 	void Start();
 	void Stop();
-	void StopAllPlayers();
 	std::shared_ptr<SoundPlayer> PlaySound(const Sound& sound, const SoundParameters& parameters);
 	std::shared_ptr<MusicPlayer> PlayMusic(std::shared_ptr<StreamDecoder> decoder, MusicParameters parameters);
 	std::shared_ptr<StreamPlayer> PlayStream(CallBackStreamPlayer callback, int length, int rate, bool stereo, AudioFormat audioFormat);
@@ -87,6 +86,7 @@ class OpenALManager {
 	bool paused_audio = false;
 	uint32_t elapsed_pause_time = 0;
 	AtomicStructure<world_location3d> listener_location = {};
+	void StopAllPlayers();
 	void UpdateParameters(const AudioParameters& parameters);
 	void UpdateListener();
 	void CleanEverything();

diff --git a/Source_Files/Sound/SoundManager.cpp b/Source_Files/Sound/SoundManager.cpp
@@ -424,8 +424,8 @@ std::shared_ptr<SoundPlayer> SoundManager::DirectPlaySound(short sound_index, an
 }
 
 void SoundManager::StopAllSounds() {
-	 auto manager = OpenALManager::Get();
-	 if (manager) manager->StopAllPlayers();
+	for (auto& soundPlayer : sound_players)
+		soundPlayer->AskStop();
 }
 
 int SoundManager::GetCurrentAudioTick() {