From 8808e6fdfe5604022a64e72df3ee60d8ed10e9d6 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Fri, 25 Oct 2019 18:39:26 +0200 Subject: Fixes for aap review (audio8) --- src/audio/MusicManager.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/audio/MusicManager.cpp') diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index fa1a9390..de4d0489 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -64,11 +64,14 @@ cMusicManager::DisplayRadioStationName() if(SampleManager.IsMP3RadioChannelAvailable()) { gStreamedSound = MusicManager.m_nCurrentStreamedSound; - if(gStreamedSound != STREAMED_SOUND_CITY_AMBIENT && - gStreamedSound != STREAMED_SOUND_WATER_AMBIENT) { - if(gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER) return; - } else { + if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT || + gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) { gStreamedSound = STREAMED_SOUND_RADIO_POLICE; + } else { + + if(gStreamedSound > + STREAMED_SOUND_RADIO_MP3_PLAYER) + return; } pRetune = gNumRetunePresses + gStreamedSound; @@ -242,4 +245,4 @@ void cMusicManager::Service() { EAXJMP(0x57D440); -} \ No newline at end of file +} -- cgit v1.2.3