Merge branch 'miami' into lcs

# Conflicts:
#	src/audio/MusicManager.cpp
This commit is contained in:
Sergeanur 2021-06-30 21:46:08 +03:00
commit dd790b00e5

View file

@ -315,8 +315,10 @@ cMusicManager::ChangeMusicMode(uint8 mode)
#ifdef PAUSE_RADIO_IN_FRONTEND #ifdef PAUSE_RADIO_IN_FRONTEND
// rewind those streams we weren't listening right now // rewind those streams we weren't listening right now
for( uint32 i = STREAMED_SOUND_RADIO_HEAD; i < STREAMED_SOUND_CUTSCENE_BIKER; i++ ) for( uint32 i = STREAMED_SOUND_RADIO_HEAD; i < STREAMED_SOUND_CUTSCENE_BIKER; i++ ) {
m_aTracks[i].m_nPosition = GetTrackStartPos(i); m_aTracks[i].m_nPosition = GetTrackStartPos(i);
m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
}
#endif #endif
break; break;