diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-30 20:21:45 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-30 20:21:45 +0200 |
| commit | a73a2c91793c329a1039032871a1cbf7bda61bd9 (patch) | |
| tree | 5ab3d4524146b5f9037d680aac0fedbfc6b94e10 | |
| parent | Fix unused code (diff) | |
| download | re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.tar re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.tar.gz re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.tar.bz2 re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.tar.lz re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.tar.xz re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.tar.zst re3-a73a2c91793c329a1039032871a1cbf7bda61bd9.zip | |
| -rw-r--r-- | src/audio/MusicManager.cpp | 17 | ||||
| -rw-r--r-- | src/core/config.h | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 5a176005..13fba08c 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -310,7 +310,16 @@ cMusicManager::ChangeMusicMode(uint8 mode) switch (mode) { - case MUSICMODE_FRONTEND: m_nUpcomingMusicMode = MUSICMODE_FRONTEND; break; + case MUSICMODE_FRONTEND: + m_nUpcomingMusicMode = MUSICMODE_FRONTEND; + +#ifdef PAUSE_RADIO_IN_FRONTEND + // rewind those streams we weren't listening right now + for( uint32 i = STREAMED_SOUND_RADIO_WILD; i < STREAMED_SOUND_CUTSCENE_ASS_1; i++ ) + m_aTracks[i].m_nPosition = GetTrackStartPos(i); +#endif + + break; case MUSICMODE_GAME: m_nUpcomingMusicMode = MUSICMODE_GAME; break; case MUSICMODE_CUTSCENE: m_nUpcomingMusicMode = MUSICMODE_CUTSCENE; @@ -414,6 +423,12 @@ cMusicManager::ServiceFrontEndMode() { static bool8 bRadioStatsRecorded = FALSE; +#ifdef PAUSE_RADIO_IN_FRONTEND + // pause radio + for (uint32 i = STREAMED_SOUND_RADIO_WILD; i < STREAMED_SOUND_CUTSCENE_ASS_1; i++) + m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); +#endif + if (m_bAnnouncementInProgress) { SampleManager.StopStreamedFile(); if (SampleManager.IsStreamPlaying()) diff --git a/src/core/config.h b/src/core/config.h index 4efe12f0..ff44eef1 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -400,6 +400,7 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually //#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder #define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files #define MULTITHREADED_AUDIO // for streams. requires C++11 or later +#define PAUSE_RADIO_IN_FRONTEND // pause radio when game is paused #ifdef AUDIO_OPUS #define AUDIO_OAL_USE_OPUS // enable support of opus files |