diff options
Diffstat (limited to 'src/audio')
-rw-r--r-- | src/audio/AudioLogic.cpp | 31 | ||||
-rw-r--r-- | src/audio/AudioManager.cpp | 16 | ||||
-rw-r--r-- | src/audio/AudioManager.h | 12 | ||||
-rw-r--r-- | src/audio/DMAudio.cpp | 114 | ||||
-rw-r--r-- | src/audio/DMAudio.h | 9 | ||||
-rw-r--r-- | src/audio/MusicManager.cpp | 1644 | ||||
-rw-r--r-- | src/audio/MusicManager.h | 70 | ||||
-rw-r--r-- | src/audio/audio_enums.h | 11 | ||||
-rw-r--r-- | src/audio/sampman.h | 12 | ||||
-rw-r--r-- | src/audio/sampman_miles.cpp | 75 | ||||
-rw-r--r-- | src/audio/sampman_null.cpp | 15 | ||||
-rw-r--r-- | src/audio/sampman_oal.cpp | 46 | ||||
-rw-r--r-- | src/audio/soundlist.h | 15 |
13 files changed, 1355 insertions, 715 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 98ebf0d8..ac81523c 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -293,6 +293,18 @@ cAudioManager::CalculateDistance(bool &distCalculated, float dist) } } +CVehicle *cAudioManager::FindVehicleOfPlayer() +{ + CVehicle* vehicle = FindPlayerVehicle(); + CPlayerPed* ped = FindPlayerPed(); + if (vehicle == nil && ped != nil) { + CEntity *attachedTo = ped->m_attachedTo; + if (attachedTo && attachedTo->IsVehicle()) + vehicle = (CVehicle*)attachedTo; + } + return vehicle; +} + void cAudioManager::ProcessSpecial() { @@ -3816,6 +3828,25 @@ cAudioManager::ProcessPedOneShots(cPedParams *params) } void +cAudioManager::SetPedTalkingStatus(CPed *ped, uint8 status) +{ + if (ped != nil) + ped->m_canTalk = status; +} + +void +cAudioManager::SetPlayersMood(uint8 mood, int32 time) +{ + if (!m_bIsInitialised) return; + + if (mood < MAX_PLAYER_MOODS) { + m_nPlayerMood = mood; + m_nPlayerMoodTimer = CTimer::GetTimeInMilliseconds() + time; + } + +} + +void cAudioManager::SetupPedComments(cPedParams *params, uint32 sound) { CPed *ped = params->m_pPed; diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 5b0b4907..f5cd9361 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -217,6 +217,12 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol) } void +cAudioManager::SetMP3BoostVolume(uint8 volume) const +{ + SampleManager.SetMP3BoostVolume(volume); +} + +void cAudioManager::SetEffectsMasterVolume(uint8 volume) const { SampleManager.SetEffectsMasterVolume(volume); @@ -337,6 +343,15 @@ cAudioManager::GetCurrent3DProviderIndex() const } int8 +cAudioManager::AutoDetect3DProviders() const +{ + if (m_bIsInitialised) + return SampleManager.AutoDetect3DProviders(); + + return -1; +} + +int8 cAudioManager::SetCurrent3DProvider(uint8 which) { if (!m_bIsInitialised) @@ -420,6 +435,7 @@ cAudioManager::IsAudioInitialised() const void cAudioManager::ServiceSoundEffects() { + field_5554++; m_bFifthFrameFlag = (m_FrameCounter++ % 5) == 0; if (m_nUserPause && !m_nPreviousUserPause) { for (int32 i = 0; i < allChannels; i++) diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index b34dbed0..f07a801e 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -196,9 +196,9 @@ public: cAudioScriptObjectManager m_sAudioScriptObjectManager; // miami - uint8 field_4B30; - uint8 m_bPlayerMood; - uint32 field_4B34; + uint8 m_bIsPlayerShutUp; + uint8 m_nPlayerMood; + uint32 m_nPlayerMoodTimer; uint8 field_rest[4]; uint8 field_4B3C; @@ -269,6 +269,7 @@ public: char *Get3DProviderName(uint8 id) const; uint8 GetCDAudioDriveLetter() const; int8 GetCurrent3DProviderIndex() const; + int8 AutoDetect3DProviders() const; float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used float GetCollisionOneShotRatio(int32 a, float b) const; float GetCollisionRatio(float a, float b, float c, float d) const; @@ -386,6 +387,7 @@ public: void SetDynamicAcousticModelingStatus(uint8 status); void SetEffectsFadeVol(uint8 volume) const; void SetEffectsMasterVolume(uint8 volume) const; + void SetMP3BoostVolume(uint8 volume) const; void SetEntityStatus(int32 id, uint8 status); uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(const cAudioCollision &audioCollision); void SetMissionAudioLocation(uint8 slot, float x, float y, float z); @@ -414,6 +416,10 @@ public: bool UsesSiren(int32 model) const; bool UsesSirenSwitching(int32 model) const; + CVehicle *FindVehicleOfPlayer(); + void SetPedTalkingStatus(CPed *ped, uint8 status); + void SetPlayersMood(uint8 mood, int32 time); + #ifdef GTA_PC // only used in pc void AdjustSamplesVolume(); diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index b3c16941..486daebf 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -65,6 +65,15 @@ cDMAudio::SetMonoMode(uint8 mono) } void +cDMAudio::SetMP3BoostVolume(uint8 volume) +{ + uint8 vol = volume; + if (vol > MAX_VOLUME) vol = MAX_VOLUME; + + AudioManager.SetMP3BoostVolume(vol); +} + +void cDMAudio::SetEffectsMasterVolume(uint8 volume) { uint8 vol = volume; @@ -112,70 +121,9 @@ cDMAudio::Get3DProviderName(uint8 id) return AudioManager.Get3DProviderName(id); } -// TODO(Miami): Content of this moved to cSampleManager or cAudioManager int8 cDMAudio::AutoDetect3DProviders(void) { - if (!AudioManager.IsAudioInitialised()) - return -1; - - int eax = -1, eax2 = -1, eax3 = -1, ds3dh = -1, ds3ds = -1; - - for ( int32 i = 0; i < GetNum3DProvidersAvailable(); i++ ) - { - char *providername = Get3DProviderName(i); - strupr(providername); - -#if defined(AUDIO_OAL) - if (!strcmp(providername, "OPENAL SOFT")) { - SetCurrent3DProvider(i); - if (GetCurrent3DProviderIndex() == i) - return i; - } -#else - if (!strcmp(providername, "CREATIVE LABS EAX 3 (TM)")) { - SetCurrent3DProvider(i); - if (GetCurrent3DProviderIndex() == i) { - eax3 = i; - } - } - - if (!strcmp(providername, "CREATIVE LABS EAX 2 (TM)")) { - SetCurrent3DProvider(i); - if (GetCurrent3DProviderIndex() == i) - eax2 = i; - } - - if (!strcmp(providername, "CREATIVE LABS EAX (TM)")) { - SetCurrent3DProvider(i); - if (GetCurrent3DProviderIndex() == i) - eax = i; - } - - if (!strcmp(providername, "DIRECTSOUND3D HARDWARE SUPPORT")) { - SetCurrent3DProvider(i); - if (GetCurrent3DProviderIndex() == i) - ds3dh = i; - } - - if (!strcmp(providername, "DIRECTSOUND3D SOFTWARE EMULATION")) { - SetCurrent3DProvider(i); - if (GetCurrent3DProviderIndex() == i) - ds3ds = i; - } -#endif - } - - if (eax3 != -1) - return eax3; - if (eax2 != -1) - return eax2; - if (eax != -1) - return eax; - if (ds3dh != -1) - return ds3dh; - if (ds3ds != -1) - return ds3ds; - return -1; + return AudioManager.AutoDetect3DProviders(); } int8 @@ -392,3 +340,45 @@ cDMAudio::SetRadioChannel(int8 radio, int32 pos) { MusicManager.SetRadioChannelByScript(radio, pos); } + +void +cDMAudio::SetStartingTrackPositions(uint8 isStartGame) +{ + MusicManager.SetStartingTrackPositions(isStartGame); +} + +float * +cDMAudio::GetListenTimeArray() +{ + return MusicManager.GetListenTimeArray(); +} + +uint32 +cDMAudio::GetFavouriteRadioStation() +{ + return MusicManager.GetFavouriteRadioStation(); +} + +int32 +cDMAudio::GetRadioPosition(uint32 station) +{ + return MusicManager.GetRadioPosition(station); +} + +void +cDMAudio::SetPedTalkingStatus(CPed *ped, uint8 status) +{ + return AudioManager.SetPedTalkingStatus(ped, status); +} + +void +cDMAudio::SetPlayersMood(uint8 mood, int32 time) +{ + return AudioManager.SetPlayersMood(mood, time); +} + +void +cDMAudio::ShutUpPlayerTalking(uint8 state) +{ + AudioManager.m_bIsPlayerShutUp = state; +}
\ No newline at end of file diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index e7d3a23b..ef62294e 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -30,6 +30,7 @@ public: void DestroyAllGameCreatedEntities(void); void SetMonoMode(uint8 mono); + void SetMP3BoostVolume(uint8 volume); void SetEffectsMasterVolume(uint8 volume); void SetMusicMasterVolume(uint8 volume); void SetEffectsFadeVol(uint8 volume); @@ -90,5 +91,13 @@ public: uint8 GetRadioInCar(void); void SetRadioInCar(uint32 radio); void SetRadioChannel(int8 radio, int32 pos); + + void SetStartingTrackPositions(uint8 isStartGame); + float *GetListenTimeArray(); + uint32 GetFavouriteRadioStation(); + int32 GetRadioPosition(uint32 station); + void SetPedTalkingStatus(class CPed *ped, uint8 status); + void SetPlayersMood(uint8 mood, int32 time); + void ShutUpPlayerTalking(uint8 state); }; extern cDMAudio DMAudio; diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index ae2e97ac..51fd2d0b 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -14,179 +14,123 @@ #include "Timer.h" #include "World.h" #include "sampman.h" - +#include "Stats.h" +#include "Script.h" +#include "ZoneCull.h" +#include "Weather.h" +#include "DMAudio.h" +#include "GenericGameStorage.h" cMusicManager MusicManager; int32 gNumRetunePresses; int32 gRetuneCounter; -bool bHasStarted; +bool g_bAnnouncementReadPosAlready; +uint8 RadioStaticCounter; +uint32 RadioStaticTimer; + +CVector vecRiotPosition(300.7f, -322.0f, 12.0f); + +uint32 NewGameRadioTimers[10] = +{ + 948160, + 452150, + 2438150, + 3538230, + 3513100, + 4246050, + 1418050, + 3178240, + 471210, + 0 +}; cMusicManager::cMusicManager() { m_bIsInitialised = false; m_bDisabled = false; + m_nFrontendTrack = NO_TRACK; + m_nPlayingTrack = NO_TRACK; + m_nUpcomingMusicMode = MUSICMODE_DISABLED; m_nMusicMode = MUSICMODE_DISABLED; - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - m_nPreviousStreamedSound = NO_STREAMED_SOUND; - m_bFrontendTrackFinished = false; - m_bPlayInFrontend = false; - m_bSetNextStation = false; - m_nAnnouncement = NO_STREAMED_SOUND; - m_bPreviousPlayerInCar = false; - m_bPlayerInCar = false; - m_bAnnouncementInProgress = false; - m_bDontServiceAmbienceTrack = false; - bHasStarted = false; -} - -bool -cMusicManager::PlayerInCar() -{ - if(!FindPlayerVehicle()) - return false; - - int32 State = FindPlayerPed()->m_nPedState; - - if(State == PED_DRAG_FROM_CAR || State == PED_EXIT_CAR || State == PED_ARRESTED) - return false; + field_2 = false; - if (!FindPlayerVehicle()) - return true; - - if (FindPlayerVehicle()->GetStatus() == STATUS_WRECKED) - return false; + for (int i = 0; i < NUM_RADIOS; i++) + aListenTimeArray[i] = 0.0f; - switch (FindPlayerVehicle()->GetModelIndex()) { - case MI_FIRETRUCK: - case MI_AMBULAN: - case MI_MRWHOOP: - case MI_PREDATOR: - case MI_TRAIN: - case MI_SPEEDER: - case MI_REEFER: -// case MI_GHOST: - return false; - default: return true; - } + m_nLastTrackServiceTime = 0.0f; + m_nVolumeLatency = 0; + m_nCurrentVolume = 0; + m_nMaxVolume = 0; + m_nAnnouncement = NO_TRACK; + m_bAnnouncementInProgress = false; } void -cMusicManager::DisplayRadioStationName() +cMusicManager::ResetMusicAfterReload() { - int8 pRetune; - int8 gStreamedSound; - int8 gRetuneCounter; - static wchar *pCurrentStation = nil; - static uint8 cDisplay = 0; - - if(!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && PlayerInCar() && - !CReplay::IsPlayingBack()) { - if(m_bPlayerInCar && !m_bPreviousPlayerInCar) - pCurrentStation = nil; - - if(SampleManager.IsMP3RadioChannelAvailable()) { - gStreamedSound = m_nCurrentStreamedSound; + float afRadioTime[NUM_RADIOS]; - 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; - - if(pRetune == POLICE_RADIO) { - pRetune = RADIO_OFF; - } else if(pRetune > POLICE_RADIO) { - pRetune = pRetune - RADIO_OFF; - } - } else { - gStreamedSound = m_nCurrentStreamedSound; - pRetune = gNumRetunePresses + gStreamedSound; - - if(pRetune >= USERTRACK) { - gRetuneCounter = gNumRetunePresses; - pRetune = m_nCurrentStreamedSound; - - if(gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) - pRetune = RADIO_OFF; + m_bRadioSetByScript = false; + m_nRadioStation = WILDSTYLE; + m_nRadioPosition = -1; + m_nAnnouncement = NO_TRACK; + m_bAnnouncementInProgress = false; + field_2 = false; + RadioStaticTimer = 0; + gNumRetunePresses = 0; + gRetuneCounter = 0; + m_nFrontendTrack = NO_TRACK; + m_nPlayingTrack = NO_TRACK; + field_398E = false; + field_398F = false; + m_nStreamedTrack = NO_TRACK; + field_3994 = false; + field_3995 = false; + field_3996 = false; + field_3997 = false; + field_3998 = -1; + field_3999 = false; + field_399A = false; + field_399C = false; + m_nVolumeLatency = 0; + m_nCurrentVolume = 0; + m_nMaxVolume = 0; + + bool bRadioWasEverListened = false; + + for (int i = 0; i < NUM_RADIOS; i++) { + afRadioTime[i] = CStats::GetFavoriteRadioStationList(i); + if (!bRadioWasEverListened && afRadioTime[i] != 0.0f) + bRadioWasEverListened = true; + } - while(gRetuneCounter) { - if(pRetune == RADIO_OFF) { - pRetune = WILDSTYLE; - } else if(pRetune < USERTRACK) { - pRetune = pRetune + 1; - } - if(pRetune == USERTRACK) pRetune = RADIO_OFF; + if (!bRadioWasEverListened) return; - --gRetuneCounter; - } + for (int i = 0; i < NUM_RADIOS; i++) { + aListenTimeArray[i] = afRadioTime[i]; + uint32 trackPos = GetSavedRadioStationPosition(i); + if (trackPos != -1) { + if (trackPos > m_aTracks[i].m_nLength) { + debug("Radio Track %d saved position is %d, Length is only %d\n", i, trackPos, m_aTracks[i].m_nLength); + trackPos %= m_aTracks[i].m_nLength; } + m_aTracks[i].m_nPosition = trackPos; + m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); } - - wchar *string = nil; - - switch(pRetune) { - case WILDSTYLE: string = TheText.Get("FEA_FM0"); break; - case FLASH_FM: string = TheText.Get("FEA_FM1"); break; - case KCHAT: string = TheText.Get("FEA_FM2"); break; - case FEVER: string = TheText.Get("FEA_FM3"); break; - case V_ROCK: string = TheText.Get("FEA_FM4"); break; - case VCPR: string = TheText.Get("FEA_FM5"); break; - case RADIO_ESPANTOSO: string = TheText.Get("FEA_FM6"); break; - case EMOTION: string = TheText.Get("FEA_FM7"); break; - case WAVE: string = TheText.Get("FEA_FM8"); break; - case USERTRACK: string = TheText.Get("FEA_FM9"); break; - default: return; - }; - - if(pRetune > WAVE && !SampleManager.IsMP3RadioChannelAvailable()) { return; } - - if(string && pCurrentStation != string || - m_nCurrentStreamedSound == STREAMED_SOUND_RADIO_MP3_PLAYER && - m_nPreviousStreamedSound != STREAMED_SOUND_RADIO_MP3_PLAYER) { - pCurrentStation = string; - cDisplay = 60; - } else { - if(cDisplay == 0) return; - cDisplay--; - } - - CFont::SetJustifyOff(); - CFont::SetBackgroundOff(); - CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f)); - CFont::SetPropOn(); - CFont::SetFontStyle(FONT_STANDARD); - CFont::SetCentreOn(); - CFont::SetCentreSize(SCREEN_SCALE_X(640.0f)); - CFont::SetColor(CRGBA(0, 0, 0, 255)); - CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation); - - if(gNumRetunePresses) - CFont::SetColor(CRGBA(102, 133, 143, 255)); - else - CFont::SetColor(CRGBA(147, 196, 211, 255)); - - CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_SCALE_Y(22.0f), pCurrentStation); - CFont::DrawFonts(); } } -bool -cMusicManager::Initialise() +void +cMusicManager::SetStartingTrackPositions(uint8 isNewGameTimer) { int pos; - if (!IsInitialised()) { + if (IsInitialised()) { time_t timevalue = time(0); if (timevalue == -1) { pos = AudioManager.GetRandomNumber(0); } else { - tm *pTm = localtime(&timevalue); + tm* pTm = localtime(&timevalue); if (pTm->tm_sec == 0) pTm->tm_sec = AudioManager.GetRandomNumber(0); if (pTm->tm_min == 0) @@ -213,22 +157,52 @@ cMusicManager::Initialise() for (int i = 0; i < TOTAL_STREAMED_SOUNDS; i++) { m_aTracks[i].m_nLength = SampleManager.GetStreamedFileLength(i); - m_aTracks[i].m_nPosition = pos * AudioManager.GetRandomNumber(i % 5) % m_aTracks[i].m_nLength; + + if (i < STREAMED_SOUND_CITY_AMBIENT && isNewGameTimer) + m_aTracks[i].m_nPosition = NewGameRadioTimers[i]; + else if (i < STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED) + m_aTracks[i].m_nPosition = pos * AudioManager.GetRandomNumber(i % 5) % m_aTracks[i].m_nLength; + else + m_aTracks[i].m_nPosition = 0; + m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); } + } +} +bool +cMusicManager::Initialise() +{ + if (!IsInitialised()) { + m_bIsInitialised = true; + SetStartingTrackPositions(false); m_bResetTimers = false; m_nResetTime = 0; - m_nTimer = m_nLastTrackServiceTime = CTimer::GetTimeInMillisecondsPauseMode(); - m_bDoTrackService = false; - m_bIgnoreTimeDelay = false; m_bRadioSetByScript = false; m_nRadioStation = WILDSTYLE; m_nRadioPosition = -1; - m_nRadioInCar = NO_STREAMED_SOUND; - gNumRetunePresses = 0; + m_nRadioInCar = NO_TRACK; gRetuneCounter = 0; - m_bIsInitialised = true; + gNumRetunePresses = 0; + m_nFrontendTrack = NO_TRACK; + m_nPlayingTrack = NO_TRACK; + m_nUpcomingMusicMode = MUSICMODE_DISABLED; + m_nMusicMode = MUSICMODE_DISABLED; + field_398E = false; + field_398F = false; + m_nStreamedTrack = NO_TRACK; + field_3994 = false; + field_3995 = false; + field_3996 = false; + field_3997 = false; + field_3998 = -1; + field_3999 = false; + field_399A = false; + m_nMusicModeToBeSet = MUSICMODE_DISABLED; + field_399C = false; + m_nVolumeLatency = 0; + m_nCurrentVolume = 0; + m_nMaxVolume = 0; } return m_bIsInitialised; } @@ -240,76 +214,60 @@ cMusicManager::Terminate() if (SampleManager.IsStreamPlaying(0)) { SampleManager.StopStreamedFile(0); - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - m_nPreviousStreamedSound = NO_STREAMED_SOUND; + m_nPlayingTrack = NO_TRACK; } m_bIsInitialised = false; } void -cMusicManager::ChangeMusicMode(uint8 mode) +cMusicManager::SetRadioChannelByScript(uint32 station, int32 pos) { - if (!IsInitialised()) return; - - uint8 mode2; - switch (mode) - { - case MUSICMODE_FRONTEND: mode2 = MUSICMODE_FRONTEND; break; - case MUSICMODE_GAME: mode2 = MUSICMODE_GAME; break; - case MUSICMODE_CUTSCENE: mode2 = MUSICMODE_CUTSCENE; break; - case MUSICMODE_DISABLE: mode2 = MUSICMODE_DISABLED; break; - default: return; - } - - if (mode2 != m_nMusicMode || mode == MUSICMODE_FRONTEND && mode2 == MUSICMODE_FRONTEND) { - switch (mode) - { - case MUSICMODE_FRONTEND: - case MUSICMODE_GAME: - case MUSICMODE_CUTSCENE: - case MUSICMODE_DISABLED: - if (SampleManager.IsStreamPlaying(0)) { - if (m_nCurrentStreamedSound < TOTAL_STREAMED_SOUNDS) { - m_aTracks[m_nCurrentStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - } - SampleManager.StopStreamedFile(0); - } - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - m_nPreviousStreamedSound = NO_STREAMED_SOUND; - m_bFrontendTrackFinished = false; - m_bPlayInFrontend = false; - m_bSetNextStation = false; - m_bPreviousPlayerInCar = false; - m_bPlayerInCar = false; - m_bAnnouncementInProgress = false; - m_nTimer = m_nLastTrackServiceTime = CTimer::GetTimeInMillisecondsPauseMode(); - m_bDoTrackService = false; - m_bIgnoreTimeDelay = true; - m_bDontServiceAmbienceTrack = false; - m_nMusicMode = mode2; - break; - default: return; + if (m_bIsInitialised) { + if (station == USERTRACK) + station = RADIO_OFF; + if (station <= STREAMED_SOUND_RADIO_POLICE) { + m_bRadioSetByScript = true; + m_nRadioStation = station; + m_nRadioPosition = pos == -1 ? -1 : pos % m_aTracks[station].m_nLength; } } } -uint8 +bool +cMusicManager::PlayerInCar() +{ + CVehicle *vehicle = AudioManager.FindVehicleOfPlayer(); + if(!vehicle) + return false; + + int32 State = FindPlayerPed()->m_nPedState; + + if(State == PED_DRAG_FROM_CAR || State == PED_EXIT_CAR || State == PED_ARRESTED) + return false; + + if (vehicle->GetStatus() == STATUS_WRECKED) + return false; + + return true; +} + +uint32 cMusicManager::GetRadioInCar(void) { if (!m_bIsInitialised) return WILDSTYLE; if (PlayerInCar()) { - CVehicle *veh = FindPlayerVehicle(); - if (veh != nil){ - if (UsesPoliceRadio(veh)) { - if (m_nRadioInCar == NO_STREAMED_SOUND || (CReplay::IsPlayingBack() && AudioManager.m_nUserPause == 0)) - return POLICE_RADIO; + CVehicle* veh = AudioManager.FindVehicleOfPlayer(); + if (veh != nil) { + if (UsesPoliceRadio(veh) || UsesTaxiRadio(veh)) { + if (m_nRadioInCar == NO_TRACK || (CReplay::IsPlayingBack() && AudioManager.m_nUserPause == 0)) + return STREAMED_SOUND_RADIO_POLICE; return m_nRadioInCar; - } else return veh->m_nRadioStation; + } + else return veh->m_nRadioStation; } } - if (m_nRadioInCar == NO_STREAMED_SOUND || (CReplay::IsPlayingBack() && AudioManager.m_nUserPause == 0)) + if (m_nRadioInCar == NO_TRACK || (CReplay::IsPlayingBack() && AudioManager.m_nUserPause == 0)) return RADIO_OFF; return m_nRadioInCar; } @@ -322,9 +280,9 @@ cMusicManager::SetRadioInCar(uint32 station) m_nRadioInCar = station; return; } - CVehicle *veh = FindPlayerVehicle(); + CVehicle* veh = AudioManager.FindVehicleOfPlayer(); if (veh == nil) return; - if (UsesPoliceRadio(veh)) + if (UsesPoliceRadio(veh) || UsesTaxiRadio(veh)) m_nRadioInCar = station; else veh->m_nRadioStation = station; @@ -332,29 +290,52 @@ cMusicManager::SetRadioInCar(uint32 station) } void -cMusicManager::SetRadioChannelByScript(uint8 station, int32 pos) +cMusicManager::RecordRadioStats() { - if (m_bIsInitialised && station < RADIO_OFF) { - m_bRadioSetByScript = true; - m_nRadioStation = station; - m_nRadioPosition = pos == -1 ? -1 : pos % m_aTracks[station].m_nLength; + if (m_nPlayingTrack < STREAMED_SOUND_CITY_AMBIENT) { + double time /*Rusty*/ = CTimer::GetTimeInMillisecondsPauseMode(); + if (time > m_nLastTrackServiceTime) + aListenTimeArray[m_nPlayingTrack] += time - m_nLastTrackServiceTime; } } - void -cMusicManager::ResetMusicAfterReload() +cMusicManager::ChangeMusicMode(uint8 mode) { - m_bRadioSetByScript = false; - m_nRadioStation = 0; - m_nRadioPosition = -1; - m_nAnnouncement = NO_STREAMED_SOUND; - m_bAnnouncementInProgress = false; - m_bSetNextStation = false; - gRetuneCounter = 0; - gNumRetunePresses = 0; -} + if (!IsInitialised()) return; + switch (mode) + { + case MUSICMODE_FRONTEND: m_nUpcomingMusicMode = MUSICMODE_FRONTEND; break; + case MUSICMODE_GAME: m_nUpcomingMusicMode = MUSICMODE_GAME; break; + case MUSICMODE_CUTSCENE: + m_nUpcomingMusicMode = MUSICMODE_CUTSCENE; + if (SampleManager.IsStreamPlaying(0)) { + if (m_nPlayingTrack != NO_TRACK) { + RecordRadioStats(); + m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0); + m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + } + } + SampleManager.StopStreamedFile(0); + while (SampleManager.IsStreamPlaying(0)) + SampleManager.StopStreamedFile(0); + m_nMusicMode = m_nUpcomingMusicMode; + field_399A = false; + field_398F = false; + m_nStreamedTrack = NO_TRACK; + field_3994 = false; + field_3995 = false; + m_nPlayingTrack = NO_TRACK; + m_nFrontendTrack = NO_TRACK; + m_bAnnouncementInProgress = false; + m_nAnnouncement = NO_TRACK; + g_bAnnouncementReadPosAlready = false; + break; + case MUSICMODE_DISABLE: m_nUpcomingMusicMode = MUSICMODE_DISABLED; break; + default: return; + } +} void cMusicManager::ResetTimers(int32 time) @@ -371,297 +352,677 @@ cMusicManager::Service() m_nLastTrackServiceTime = m_nResetTime; } - if (!m_bIsInitialised || m_bDisabled) return; - - if (m_nMusicMode == MUSICMODE_CUTSCENE) { - SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0); - return; - } + static bool bRadioStatsRecorded = false; - m_nTimer = CTimer::GetTimeInMillisecondsPauseMode(); - if (m_nTimer > (m_nLastTrackServiceTime + 2000) || m_bIgnoreTimeDelay) { - m_bIgnoreTimeDelay = false; - m_bDoTrackService = true; - m_nLastTrackServiceTime = m_nTimer; - } else m_bDoTrackService = false; + if (!m_bIsInitialised || m_bDisabled) return; - if (m_nCurrentStreamedSound == NO_STREAMED_SOUND && SampleManager.IsStreamPlaying(0)) - SampleManager.StopStreamedFile(0); - else switch (m_nMusicMode) { - case MUSICMODE_FRONTEND: ServiceFrontEndMode(); break; - case MUSICMODE_GAME: ServiceGameMode(); break; + if (!field_399A) + m_nMusicModeToBeSet = m_nUpcomingMusicMode; + if (m_nMusicModeToBeSet == m_nMusicMode) { + if (!AudioManager.m_nUserPause || AudioManager.m_nPreviousUserPause || m_nMusicMode != MUSICMODE_FRONTEND) + { + switch (m_nMusicMode) + { + case MUSICMODE_FRONTEND: ServiceFrontEndMode(); break; + case MUSICMODE_GAME: ServiceGameMode(); break; + case MUSICMODE_CUTSCENE: SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0); break; + } + } + else + m_nMusicMode = MUSICMODE_DISABLED; + } else { + field_399A = true; + if (!field_3999 && !AudioManager.m_nUserPause && AudioManager.m_nPreviousUserPause) + field_3999 = true; + if (AudioManager.field_5554 % 4 == 0) { + gNumRetunePresses = 0; + gRetuneCounter = 0; + field_2 = false; + if (SampleManager.IsStreamPlaying(0)) { + if (m_nPlayingTrack != NO_TRACK && !bRadioStatsRecorded) + { + RecordRadioStats(); + m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0); + m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + bRadioStatsRecorded = true; + } + SampleManager.StopStreamedFile(0); + } else { + bRadioStatsRecorded = false; + m_nMusicMode = m_nMusicModeToBeSet; + field_399A = false; + field_398F = false; + m_nStreamedTrack = NO_TRACK; + field_3994 = false; + field_3995 = false; + m_nPlayingTrack = NO_TRACK; + if (field_399C) + field_399C = false; + else + m_nFrontendTrack = NO_TRACK; + } } + } } void cMusicManager::ServiceFrontEndMode() { - if (m_nCurrentStreamedSound < TOTAL_STREAMED_SOUNDS) { - if (m_bFrontendTrackFinished) { - if (!SampleManager.IsStreamPlaying(0)) { - switch (m_nCurrentStreamedSound) - { - case STREAMED_SOUND_MISSION_COMPLETED: - if (!AudioManager.m_nUserPause) - ChangeMusicMode(MUSICMODE_GAME); - break; - default: - break; + static bool bRadioStatsRecorded = false; + + if (m_bAnnouncementInProgress) { + SampleManager.StopStreamedFile(0); + if (SampleManager.IsStreamPlaying(0)) + return; + g_bAnnouncementReadPosAlready = false; + m_nAnnouncement = NO_TRACK; + m_bAnnouncementInProgress = false; + m_nStreamedTrack = NO_TRACK; + m_nFrontendTrack = NO_TRACK; + m_nPlayingTrack = NO_TRACK; + } + + if (AudioManager.field_5554 % 4 != 0) return; + + if (!field_398F && !field_3995) { + m_nStreamedTrack = m_nFrontendTrack; + field_3994 = field_398E; + } + + if (m_nStreamedTrack == m_nPlayingTrack) { + if (SampleManager.IsStreamPlaying(0)) { + if (m_nVolumeLatency > 0) m_nVolumeLatency--; + else { + if (m_nCurrentVolume < m_nMaxVolume) + m_nCurrentVolume = Min(m_nMaxVolume, m_nCurrentVolume + 6); + SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63u, 0, 0); + } + } else { + if (m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER) + SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0, 0); + else if (m_nPlayingTrack == STREAMED_SOUND_MISSION_COMPLETED && AudioManager.m_nUserPause == 0) + ChangeMusicMode(MUSICMODE_GAME); + } + } else { + field_398F = true; + if (field_3995 || !SampleManager.IsStreamPlaying(0)) { + bRadioStatsRecorded = false; + if (SampleManager.IsStreamPlaying(0) || m_nStreamedTrack == NO_TRACK) { + m_nPlayingTrack = m_nStreamedTrack; + field_3995 = false; + field_398F = false; + } else { + uint32 trackStartPos = (m_nStreamedTrack > STREAMED_SOUND_RADIO_POLICE) ? 0 : GetTrackStartPos(m_nStreamedTrack); + if (m_nStreamedTrack != NO_TRACK) { + SampleManager.SetStreamedFileLoopFlag(field_3994, 0); + SampleManager.StartStreamedFile(m_nStreamedTrack, trackStartPos, 0); + m_nVolumeLatency = 3; + m_nCurrentVolume = 0; + m_nMaxVolume = 100; + SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0); + if (m_nStreamedTrack < STREAMED_SOUND_CITY_AMBIENT) + m_nLastTrackServiceTime = CTimer::GetTimeInMillisecondsPauseMode(); + field_3995 = true; } - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - m_nPreviousStreamedSound = NO_STREAMED_SOUND; } - } else if (bHasStarted) { - if (!SampleManager.IsStreamPlaying(0)) - SampleManager.StartStreamedFile(m_nCurrentStreamedSound, 0, 0); } else { + if (m_nPlayingTrack != NO_TRACK && !bRadioStatsRecorded) { + m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0); + m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + RecordRadioStats(); + bRadioStatsRecorded = true; + } SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); - if (!SampleManager.StartStreamedFile(m_nCurrentStreamedSound, m_nCurrentStreamedSound < STREAMED_SOUND_RADIO_POLICE ? GetTrackStartPos(m_nCurrentStreamedSound) : 0, 0)) - return; - SampleManager.SetStreamedVolumeAndPan(100, 63, 0, 0); - if (m_bPlayInFrontend) bHasStarted = true; - else m_bFrontendTrackFinished = true; + SampleManager.StopStreamedFile(0); } } - if (SampleManager.IsStreamPlaying(0)) - SampleManager.SetStreamedVolumeAndPan((CPad::GetPad(0)->bDisplayNoControllerMessage || CPad::GetPad(0)->bObsoleteControllerMessage) ? 0 : 100, 63, 0, 0); } void cMusicManager::ServiceGameMode() { - bool bRadioOff = false; - static int8 nFramesSinceCutsceneEnded = -1; - - m_bPreviousPlayerInCar = m_bPlayerInCar; - m_bPlayerInCar = PlayerInCar(); - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - if (m_bPlayerInCar) { - if (FindPlayerPed() != nil - && !FindPlayerPed()->DyingOrDead() - && CPad::GetPad(0)->ChangeStationJustDown() - && !CReplay::IsPlayingBack() - && FindPlayerVehicle() != nil - && !UsesPoliceRadio(FindPlayerVehicle())) { - gRetuneCounter = 30; - gNumRetunePresses++; - AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE, 1.0f); - if (SampleManager.IsMP3RadioChannelAvailable()) { - if (gNumRetunePresses > RADIO_OFF) - gNumRetunePresses -= RADIO_OFF; + CPed *ped = FindPlayerPed(); + CVehicle *vehicle = AudioManager.FindVehicleOfPlayer(); + field_3997 = field_3996; + field_3996 = false; + + switch (CGame::currArea) + { + case AREA_HOTEL: + case AREA_MALL: + case AREA_STRIP_CLUB: + case AREA_DIRT: + case AREA_BLOOD: + case AREA_OVALRING: + case AREA_MALIBU_CLUB: + field_3996 = false; + break; + default: + if (SampleManager.GetMusicVolume()) { + if (PlayerInCar()) + field_3996 = true; + } else + field_3996 = false; + break; + } + + if (!field_3996) { + field_3998 = -1; + gNumRetunePresses = 0; + gRetuneCounter = 0; + field_2 = false; + } else if (ped) { + if (ped->m_objective != OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN && ped->m_objective != OBJ_55) { +#ifdef GTA_PC + if (SampleManager.IsMP3RadioChannelAvailable() + && vehicle->m_nRadioStation < USERTRACK + && ControlsManager.GetIsKeyboardKeyJustDown(rsF9) + && vehicle) + { + if (!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) { + gNumRetunePresses = 0; + gRetuneCounter = 20; + RadioStaticCounter = 0; + if (vehicle->m_nRadioStation < USERTRACK) + { + do + ++gNumRetunePresses; + while (gNumRetunePresses + vehicle->m_nRadioStation < USERTRACK); + } + } + } +#endif + if (CPad::GetPad(0)->ChangeStationJustDown() && vehicle) + { + if (!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) { + gNumRetunePresses++; + gRetuneCounter = 20; + RadioStaticCounter = 0; } + } + } - } else { - nFramesSinceCutsceneEnded = -1; } - if (AudioManager.m_nPreviousUserPause) - m_bPreviousPlayerInCar = false; - if (!m_bPlayerInCar) { - if (m_bPreviousPlayerInCar) { - if (m_nCurrentStreamedSound != STREAMED_SOUND_RADIO_POLICE) - m_nRadioInCar = m_nCurrentStreamedSound; - } - ServiceAmbience(); - return; + if (field_3999) + { + field_3997 = false; + field_3999 = false; } + if (m_nPlayingTrack == NO_TRACK && m_nFrontendTrack == NO_TRACK) + field_3997 = false; - if (m_bPreviousPlayerInCar) { - if (m_nAnnouncement < TOTAL_STREAMED_SOUNDS - && (m_nCurrentStreamedSound < STREAMED_SOUND_CITY_AMBIENT || m_bAnnouncementInProgress) - && ServiceAnnouncement()) + if (field_3996) + { + if (field_3997) { - if (m_bAnnouncementInProgress) { - m_bSetNextStation = false; - return; + if (m_nAnnouncement < NO_TRACK) { + if ((m_bAnnouncementInProgress || m_nFrontendTrack == m_nPlayingTrack) && ServiceAnnouncement()) { + if (m_bAnnouncementInProgress) { + field_2 = false; + gNumRetunePresses = 0; + gRetuneCounter = 0; + return; + } + if (m_nAnnouncement == NO_TRACK) + { + m_nFrontendTrack = GetCarTuning(); + field_2 = false; + gRetuneCounter = 0; + gNumRetunePresses = 0; + } + } } - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = GetCarTuning(); - } - if (SampleManager.IsMP3RadioChannelAvailable() - && m_nCurrentStreamedSound != STREAMED_SOUND_RADIO_MP3_PLAYER - && ControlsManager.GetIsKeyboardKeyJustDown(rsF9)) - { - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = STREAMED_SOUND_RADIO_MP3_PLAYER; - if (FindPlayerVehicle() != nil) - FindPlayerVehicle()->m_nRadioStation = STREAMED_SOUND_RADIO_MP3_PLAYER; - AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE, 1.0f); - gRetuneCounter = 0; - gNumRetunePresses = 0; - m_bSetNextStation = false; - } - if (gNumRetunePresses) { - if (gRetuneCounter != 0) gRetuneCounter--; - else m_bSetNextStation = true; - } - if (gRetuneCounter) - AudioManager.DoPoliceRadioCrackle(); - if (m_bSetNextStation) { - m_bSetNextStation = false; - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = GetNextCarTuning(); - if (m_nCurrentStreamedSound == STREAMED_SOUND_CITY_AMBIENT || m_nCurrentStreamedSound == STREAMED_SOUND_WATER_AMBIENT) - bRadioOff = true; - - if (m_nPreviousStreamedSound == STREAMED_SOUND_CITY_AMBIENT || m_nPreviousStreamedSound == STREAMED_SOUND_WATER_AMBIENT) - AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE, 0.0f); - } - if (m_nCurrentStreamedSound < STREAMED_SOUND_CITY_AMBIENT) { - if (ChangeRadioChannel()) { - ServiceTrack(); - } else { - m_bPlayerInCar = false; - if (FindPlayerVehicle()) - FindPlayerVehicle()->m_nRadioStation = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = NO_STREAMED_SOUND; + if (!m_bAnnouncementInProgress + && m_nAnnouncement == NO_TRACK + && m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER + && !SampleManager.IsStreamPlaying(0)) + { + SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0, 0); } - if (CTimer::GetIsSlowMotionActive()) { - if (TheCamera.pTargetEntity != nil) { - float dist = (TheCamera.pTargetEntity->GetPosition() - TheCamera.GetPosition()).MagnitudeSqr(); - if (dist >= 3025.0f) { - SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); - } else if (dist >= 100.0f) { - int8 volume = ((45.0f - (Sqrt(dist) - 10.0f)) / 45.0f * 100.0f); - int8 pan; - if (AudioManager.ShouldDuckMissionAudio(0) || AudioManager.ShouldDuckMissionAudio(1)) - volume /= 4; - if (volume != 0) { - CVector trVec; - AudioManager.TranslateEntity(&TheCamera.pTargetEntity->GetPosition(), &trVec); - pan = AudioManager.ComputePan(55.0f, &trVec); - } else { - pan = 0; - } - if (gRetuneCounter) - volume /= 4; - SampleManager.SetStreamedVolumeAndPan(volume, pan, 0, 0); - } else if (AudioManager.ShouldDuckMissionAudio(0) || AudioManager.ShouldDuckMissionAudio(1)) { - SampleManager.SetStreamedVolumeAndPan(25, 63, 0, 0); - } else if (gRetuneCounter) { - SampleManager.SetStreamedVolumeAndPan(25, 63, 0, 0); - } else { - SampleManager.SetStreamedVolumeAndPan(100, 63, 0, 0); + + if (!m_bRadioSetByScript) + { + if (gNumRetunePresses != 0) + { + if (--gRetuneCounter == 0) + { + field_2 = true; + gRetuneCounter = 0; } } - } else if (AudioManager.ShouldDuckMissionAudio(0) || AudioManager.ShouldDuckMissionAudio(1)) { - SampleManager.SetStreamedVolumeAndPan(25, 63, 0, 0); - nFramesSinceCutsceneEnded = 0; - } else { - int8 volume; - if (nFramesSinceCutsceneEnded == -1) { - volume = 100; - } else if (nFramesSinceCutsceneEnded >= 20) { - if (nFramesSinceCutsceneEnded >= 40) { - nFramesSinceCutsceneEnded = -1; - volume = 100; - } else { - volume = 3 * (nFramesSinceCutsceneEnded - 20) + 25; - nFramesSinceCutsceneEnded++; + if (gRetuneCounter) + { + int32 station = gNumRetunePresses + vehicle->m_nRadioStation; + while (station >= RADIO_OFF) station -= RADIO_OFF; + + if (!DMAudio.IsMP3RadioChannelAvailable() && station == USERTRACK) + { + ++gNumRetunePresses; + station = NUM_RADIOS; } - } else { - nFramesSinceCutsceneEnded++; - volume = 25; + if (station == NUM_RADIOS) + { + if (gRetuneCounter == NUM_RADIOS + 9) + { + AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_NO_RADIO, 0.0f); + RadioStaticCounter = 5; + } + } + else + { + if (station == WILDSTYLE && gRetuneCounter == NUM_RADIOS + 9) + AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE, 0.0f); + AudioManager.DoPoliceRadioCrackle(); + } + } + if (RadioStaticCounter < 2 && CTimer::GetTimeInMilliseconds() > RadioStaticTimer + 800) + { + AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_194, 0.0f); + RadioStaticCounter++; + RadioStaticTimer = CTimer::GetTimeInMilliseconds(); } - if (gRetuneCounter) volume /= 4; - SampleManager.SetStreamedVolumeAndPan(volume, 63, 0, 0); + if (field_2) + m_nFrontendTrack = GetNextCarTuning(); + if (m_nFrontendTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nFrontendTrack <= STREAMED_SOUND_AMBSIL_AMBIENT) + SetUpCorrectAmbienceTrack(); + ServiceTrack(vehicle, ped); + if (field_2) + field_2 = false; + return; + } + if (UsesPoliceRadio(vehicle)) + m_nFrontendTrack = STREAMED_SOUND_RADIO_POLICE; + else if (UsesTaxiRadio(vehicle)) + m_nFrontendTrack = STREAMED_SOUND_RADIO_TAXI; + else { + m_nFrontendTrack = m_nRadioStation; + vehicle->m_nRadioStation = m_nRadioStation; + } + + if (m_nRadioPosition != -1) { + m_aTracks[m_nFrontendTrack].m_nPosition = m_nRadioPosition; + m_aTracks[m_nFrontendTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); } + + gRetuneCounter = 0; + gNumRetunePresses = 0; + field_2 = false; + m_bRadioSetByScript = false; + if (m_nFrontendTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nFrontendTrack <= STREAMED_SOUND_AMBSIL_AMBIENT) + SetUpCorrectAmbienceTrack(); + ServiceTrack(vehicle, ped); + if (field_2) + field_2 = false; return; } - if (bRadioOff) { - m_nCurrentStreamedSound = m_nPreviousStreamedSound; - if (FindPlayerVehicle() != nil) - FindPlayerVehicle()->m_nRadioStation = RADIO_OFF; - AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_NO_RADIO, 0.0f); + if (vehicle == nil) + { + m_nFrontendTrack = STREAMED_SOUND_RADIO_WAVE; // huh? + return; } - ServiceAmbience(); - return; - } - if (m_bRadioSetByScript) { - if (UsesPoliceRadio(FindPlayerVehicle())) { - m_nCurrentStreamedSound = STREAMED_SOUND_RADIO_POLICE; - } else { - m_nCurrentStreamedSound = m_nRadioStation; - if (FindPlayerVehicle()->m_nRadioStation == m_nCurrentStreamedSound) { - m_nPreviousStreamedSound = NO_STREAMED_SOUND; - SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); - SampleManager.StopStreamedFile(0); + if (m_bRadioSetByScript) + { + if (UsesPoliceRadio(vehicle)) + m_nFrontendTrack = STREAMED_SOUND_RADIO_POLICE; + else if (UsesTaxiRadio(vehicle)) + m_nFrontendTrack = STREAMED_SOUND_RADIO_TAXI; + else { + m_nFrontendTrack = m_nRadioStation; + vehicle->m_nRadioStation = m_nRadioStation; } - if (m_nRadioPosition != -1) { - m_aTracks[m_nCurrentStreamedSound].m_nPosition = m_nRadioPosition; - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + if (m_nRadioPosition != -1) + { + m_aTracks[m_nFrontendTrack].m_nPosition = m_nRadioPosition; + m_aTracks[m_nFrontendTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); } + m_bRadioSetByScript = false; + return; } - } else { - m_nCurrentStreamedSound = GetCarTuning(); - } - if (m_nCurrentStreamedSound >= RADIO_OFF) { - ServiceAmbience(); + + m_nFrontendTrack = GetCarTuning(); return; } - if (ChangeRadioChannel()) { - if (m_bRadioSetByScript) { - m_bRadioSetByScript = false; - FindPlayerVehicle()->m_nRadioStation = m_nCurrentStreamedSound; - } - } else { - m_bPlayerInCar = false; - m_nCurrentStreamedSound = NO_STREAMED_SOUND; + + if (m_bAnnouncementInProgress) + { + SampleManager.StopStreamedFile(0); + if (SampleManager.IsStreamPlaying(0)) + return; + g_bAnnouncementReadPosAlready = false; + m_nAnnouncement = NO_TRACK; + m_bAnnouncementInProgress = false; + m_nStreamedTrack = NO_TRACK; + m_nFrontendTrack = NO_TRACK; + m_nPlayingTrack = NO_TRACK; } + SetUpCorrectAmbienceTrack(); + ServiceTrack(nil, ped); } void -cMusicManager::StopFrontEndTrack() +cMusicManager::SetUpCorrectAmbienceTrack() { - if (IsInitialised() && !m_bDisabled && m_nMusicMode == MUSICMODE_FRONTEND && m_nCurrentStreamedSound != NO_STREAMED_SOUND) { - m_aTracks[m_nCurrentStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - SampleManager.StopStreamedFile(0); - m_nPreviousStreamedSound = NO_STREAMED_SOUND; - m_nCurrentStreamedSound = NO_STREAMED_SOUND; + switch (CGame::currArea) + { + case AREA_MAIN_MAP: + case AREA_EVERYWHERE: + if (CTheScripts::RiotIntensity != 0 && ((TheCamera.GetPosition() - vecRiotPosition).MagnitudeSqr() < SQR(65.0f))) + m_nFrontendTrack = STREAMED_SOUND_LAW4RIOT_AMBIENT; + else if (TheCamera.DistanceToWater <= 90.0f) { + if (CCullZones::bAtBeachForAudio) { + if (CWeather::OldWeatherType != WEATHER_HURRICANE && CWeather::NewWeatherType != WEATHER_HURRICANE || CWeather::Wind <= 1.0f) + m_nFrontendTrack = STREAMED_SOUND_BEACH_AMBIENT; + else + m_nFrontendTrack = STREAMED_SOUND_HAVANA_BEACH_AMBIENT; + } + else if (CWeather::OldWeatherType != WEATHER_HURRICANE && CWeather::NewWeatherType != WEATHER_HURRICANE || CWeather::Wind <= 1.0f) + m_nFrontendTrack = STREAMED_SOUND_WATER_AMBIENT; + else + m_nFrontendTrack = STREAMED_SOUND_HAVANA_WATER_AMBIENT; + } + else if (CWeather::OldWeatherType != WEATHER_HURRICANE && CWeather::NewWeatherType != WEATHER_HURRICANE || CWeather::Wind <= 1.0f) + m_nFrontendTrack = STREAMED_SOUND_CITY_AMBIENT; + else + m_nFrontendTrack = STREAMED_SOUND_HAVANA_CITY_AMBIENT; + break; + case AREA_HOTEL: + m_nFrontendTrack = STREAMED_SOUND_HOTEL_AMBIENT; + break; + case AREA_MALL: + m_nFrontendTrack = STREAMED_SOUND_MALL_AMBIENT; + break; + case AREA_STRIP_CLUB: + m_nFrontendTrack = STREAMED_SOUND_STRIPCLUB_AMBIENT; + break; + case AREA_DIRT: + case AREA_BLOOD: + case AREA_OVALRING: + m_nFrontendTrack = STREAMED_SOUND_DIRTRING_AMBIENT; + break; + case AREA_MALIBU_CLUB: + m_nFrontendTrack = STREAMED_SOUND_MALIBU_AMBIENT; + break; + case AREA_MANSION: + case AREA_BANK: + case AREA_LAWYERS: + case AREA_COFFEE_SHOP: + case AREA_CONCERT_HALL: + case AREA_STUDIO: + case AREA_RIFLE_RANGE: + case AREA_BIKER_BAR: + case AREA_POLICE_STATION: + m_nFrontendTrack = STREAMED_SOUND_AMBSIL_AMBIENT; + break; + } +} + +float +GetHeightScale() +{ + if (TheCamera.GetPosition().z > 20.0f) { + if (TheCamera.GetPosition().z < 50.0f) + return 1.0f - (TheCamera.GetPosition().z - 20.0f) / 30.0f; + return 0.0f; } + return 1.0f; } void -cMusicManager::PlayAnnouncement(uint32 announcement) +cMusicManager::ComputeAmbienceVol(uint8 reset, uint8& outVolume) { - if (IsInitialised() && !m_bDisabled && !m_bAnnouncementInProgress) - m_nAnnouncement = announcement; + static float fVol = 0.0f; + + float fHeightScale = GetHeightScale(); + + if (CTheScripts::RiotIntensity > 0) { + float distToRiotSq = (TheCamera.GetPosition() - vecRiotPosition).MagnitudeSqr(); + if (distToRiotSq < SQR(100.0f)) { + if (distToRiotSq >= SQR(65.0f)) + outVolume = (Sqrt(distToRiotSq) - 65.0f) / 35.0f * (127.0f * fHeightScale); + else if (distToRiotSq >= SQR(20.0f)) + outVolume = (CTheScripts::RiotIntensity * (1.0f - (Sqrt(distToRiotSq) - 20.0f) / 45.0f) * (127.0f * fHeightScale)) / MAX_VOLUME; + else + outVolume = (CTheScripts::RiotIntensity * (127.0f * fHeightScale)) / MAX_VOLUME; + return; + } + } + + if (reset) + fVol = 0.0f; + else if (fVol < 60.0f) { + if ((m_nPlayingTrack >= STREAMED_SOUND_HAVANA_CITY_AMBIENT) && (m_nPlayingTrack <= STREAMED_SOUND_HAVANA_BEACH_AMBIENT)) + fVol += 20.0f; + else + fVol += 1.0f; + fVol = Min(fVol, 60.0f); + } + + if ((m_nPlayingTrack >= STREAMED_SOUND_MALL_AMBIENT) && (m_nPlayingTrack <= STREAMED_SOUND_AMBSIL_AMBIENT)) { + outVolume = fVol; + return; + } + + if (CWeather::OldWeatherType == WEATHER_HURRICANE || CWeather::NewWeatherType == WEATHER_HURRICANE) { + if (CWeather::Wind > 1.0f) { + outVolume = (CWeather::Wind - 1.0f) * fVol; + return; + } + fVol = (1.0f - CWeather::Wind) * fVol; + } + + if (TheCamera.DistanceToWater > 140.0f) { + outVolume = fVol; + return; + } + + if (TheCamera.DistanceToWater > 90.0f) { + outVolume = ((TheCamera.DistanceToWater - 90.0f) / 50.0f * fVol * fHeightScale); + return; + } + + if (TheCamera.DistanceToWater > 40.0f) { + outVolume = fVol; + return; + } + + outVolume = (90.0f - fHeightScale) / 50.0f * fVol; +} + +bool +cMusicManager::ServiceAnnouncement() +{ + if (m_bAnnouncementInProgress) { + if (SampleManager.IsStreamPlaying(0)) + m_nPlayingTrack = m_nStreamedTrack; + else if (m_nPlayingTrack != NO_TRACK) { + m_nAnnouncement = NO_TRACK; + m_bAnnouncementInProgress = false; + m_nPlayingTrack = NO_TRACK; + } + return true; + } else if (SampleManager.IsStreamPlaying(0)) { + if (m_nPlayingTrack != NO_TRACK && !g_bAnnouncementReadPosAlready) { + RecordRadioStats(); + m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0); + g_bAnnouncementReadPosAlready = true; + m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + } + SampleManager.StopStreamedFile(0); + } else { + g_bAnnouncementReadPosAlready = false; + m_nPlayingTrack = NO_TRACK; + m_nStreamedTrack = m_nAnnouncement; + SampleManager.SetStreamedFileLoopFlag(0, false); + SampleManager.StartStreamedFile(m_nStreamedTrack, 0, 0); + SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 0, 0); + m_bAnnouncementInProgress = true; + } + + return true; } void -cMusicManager::PlayFrontEndTrack(uint32 track, uint8 bPlayInFrontend) +cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped) { - if (IsInitialised() && !m_bDisabled && track < TOTAL_STREAMED_SOUNDS) { - if (m_nMusicMode == MUSICMODE_GAME) { - if (m_nCurrentStreamedSound != NO_STREAMED_SOUND) { - if (m_bAnnouncementInProgress) { - m_nAnnouncement = NO_STREAMED_SOUND; - m_bAnnouncementInProgress = false; - } - m_aTracks[m_nCurrentStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + static bool bRadioStatsRecorded = false; + static bool bRadioStatsRecorded2 = false; + uint8 AmbienceVol; + if (!field_398F) + m_nStreamedTrack = m_nFrontendTrack; + if (gRetuneCounter != 0 || field_2) { + if (SampleManager.IsStreamPlaying(0)) { + if (m_nPlayingTrack != NO_TRACK && !bRadioStatsRecorded) { + m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0); + m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + RecordRadioStats(); + bRadioStatsRecorded = true; } + SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); SampleManager.StopStreamedFile(0); - } else if (m_nMusicMode == MUSICMODE_FRONTEND) { - if (m_nCurrentStreamedSound != NO_STREAMED_SOUND) { - m_aTracks[m_nCurrentStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + } + return; + } + + if (bRadioStatsRecorded) { + bRadioStatsRecorded = false; + m_nPlayingTrack = NO_TRACK; + } + + if (m_nStreamedTrack != m_nPlayingTrack) + { + field_398F = true; + SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); + if (!(AudioManager.field_5554 & 1)) { + if (field_3995 || !SampleManager.IsStreamPlaying(0)) { + bRadioStatsRecorded2 = false; + if (SampleManager.IsStreamPlaying(0)) { + m_nPlayingTrack = m_nStreamedTrack; + field_3995 = false; + field_398F = false; + if (veh) { + if (veh->m_nRadioStation < STREAMED_SOUND_CITY_AMBIENT || veh->m_nRadioStation > STREAMED_SOUND_AMBSIL_AMBIENT) + veh->m_nRadioStation = m_nPlayingTrack; + else + veh->m_nRadioStation = STREAMED_SOUND_CITY_AMBIENT; + } + } else { + uint32 pos = GetTrackStartPos(m_nStreamedTrack); + if (m_nStreamedTrack != NO_TRACK) { + SampleManager.SetStreamedFileLoopFlag(1, 0); + SampleManager.StartStreamedFile(m_nStreamedTrack, pos, 0); + if (m_nFrontendTrack < STREAMED_SOUND_CITY_AMBIENT || m_nFrontendTrack > STREAMED_SOUND_AMBSIL_AMBIENT) + { + m_nVolumeLatency = 10; + m_nCurrentVolume = 0; + m_nMaxVolume = 100; + SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0); + } + else + { + ComputeAmbienceVol(true, AmbienceVol); + SampleManager.SetStreamedVolumeAndPan(AmbienceVol, 63, 1, 0); + } + if (m_nStreamedTrack < STREAMED_SOUND_CITY_AMBIENT) + m_nLastTrackServiceTime = CTimer::GetTimeInMillisecondsPauseMode(); + field_3995 = true; + } + } + } else { + if (m_nPlayingTrack == NO_TRACK) + debug("m_nPlayingTrack == NO_TRACK, yet track playing - tidying up\n"); + else if (!bRadioStatsRecorded2) + { + m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0); + m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + bRadioStatsRecorded2 = true; + RecordRadioStats(); + if (m_nPlayingTrack >= STREAMED_SOUND_HAVANA_CITY_AMBIENT && m_nPlayingTrack <= STREAMED_SOUND_HAVANA_BEACH_AMBIENT) + { + if (m_nStreamedTrack >= STREAMED_SOUND_HAVANA_CITY_AMBIENT && m_nStreamedTrack <= STREAMED_SOUND_HAVANA_BEACH_AMBIENT) + AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE_2, 0.0); + } + } + SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); + SampleManager.StopStreamedFile(0); } - SampleManager.StopStreamedFile(0); } + return; + } - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = track; - m_bPlayInFrontend = !!bPlayInFrontend; - m_bFrontendTrackFinished = false; - m_bDoTrackService = true; - bHasStarted = false; - if (m_nCurrentStreamedSound < STREAMED_SOUND_RADIO_POLICE) { - gRetuneCounter = 0; - gNumRetunePresses = 0; + if (m_nPlayingTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nPlayingTrack <= STREAMED_SOUND_AMBSIL_AMBIENT) + { + ComputeAmbienceVol(false, AmbienceVol); + SampleManager.SetStreamedVolumeAndPan(AmbienceVol, 63, 1, 0); + return; + } + if (CTimer::GetIsSlowMotionActive()) + { + if (TheCamera.pTargetEntity) + { + float DistToTargetSq = (TheCamera.pTargetEntity->GetPosition() - TheCamera.GetPosition()).MagnitudeSqr(); + if (DistToTargetSq >= SQR(55.0f)) + { + SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); + } + else if (DistToTargetSq >= SQR(10.0f)) + { + AmbienceVol = (45.0f - (Sqrt(DistToTargetSq) - 10.0f)) / 45.0f * m_nCurrentVolume; + if (AudioManager.ShouldDuckMissionAudio(0) || AudioManager.ShouldDuckMissionAudio(1)) + AmbienceVol /= 4; + + uint8 pan = 0; + if (AmbienceVol > 0) + { + CVector panVec; + AudioManager.TranslateEntity(&TheCamera.pTargetEntity->GetPosition(), &panVec); + pan = AudioManager.ComputePan(55.0f, &panVec); + } + if (gRetuneCounter != 0) + AmbienceVol = 0; + SampleManager.SetStreamedVolumeAndPan(AmbienceVol, pan, 0, 0); + } + else if (!AudioManager.ShouldDuckMissionAudio(0) && !AudioManager.ShouldDuckMissionAudio(1)) + { + if (gRetuneCounter == 0) + SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0); + else + SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); + } + else + SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0); } } + else + { + if (!AudioManager.ShouldDuckMissionAudio(0) && !AudioManager.ShouldDuckMissionAudio(1)) { + if (field_3998 == -1) + AmbienceVol = m_nCurrentVolume; + else if (field_3998 < 20) + { + AmbienceVol = Min(m_nCurrentVolume, 25); + field_3998++; + } + else if (field_3998 < 40) + { + AmbienceVol = Min(m_nCurrentVolume, 3 * (field_3998 - 20) + 25); + field_3998++; + } + else + { + AmbienceVol = m_nCurrentVolume; + field_3998 = -1; + } + if (gRetuneCounter != 0) + AmbienceVol = 0; + SampleManager.SetStreamedVolumeAndPan(AmbienceVol, 63, 0, 0); + } else + SampleManager.SetStreamedVolumeAndPan(Min(m_nCurrentVolume, 25), 63, 0, 0); + } + if (m_nVolumeLatency > 0) + m_nVolumeLatency--; + else if (m_nCurrentVolume < m_nMaxVolume) + m_nCurrentVolume = Min(m_nMaxVolume, m_nCurrentVolume + 6); } void @@ -673,7 +1034,7 @@ cMusicManager::PreloadCutSceneMusic(uint32 track) SampleManager.StopStreamedFile(0); SampleManager.PreloadStreamedFile(track, 0); SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0); - m_nCurrentStreamedSound = track; + m_nPlayingTrack = track; } } @@ -689,223 +1050,270 @@ cMusicManager::StopCutSceneMusic(void) { if (IsInitialised() && !m_bDisabled && m_nMusicMode == MUSICMODE_CUTSCENE) { SampleManager.StopStreamedFile(0); - m_nCurrentStreamedSound = NO_STREAMED_SOUND; + m_nPlayingTrack = NO_TRACK; } } -uint32 -cMusicManager::GetTrackStartPos(uint8 track) +void +cMusicManager::PlayFrontEndTrack(uint32 track, uint8 bPlayInFrontend) { - uint32 result; - uint32 timer = m_aTracks[track].m_nLastPosCheckTimer; - if (CTimer::GetTimeInMillisecondsPauseMode() <= timer) { - result = m_aTracks[track].m_nPosition; - m_aTracks[track].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - } else - result = Min(CTimer::GetTimeInMillisecondsPauseMode() - timer, 90000) + m_aTracks[track].m_nPosition; + if (IsInitialised() && !m_bDisabled && track < TOTAL_STREAMED_SOUNDS && (m_nUpcomingMusicMode == MUSICMODE_FRONTEND || m_nMusicMode == MUSICMODE_FRONTEND)) + { + m_nFrontendTrack = track; + field_398E = bPlayInFrontend; + if (m_nMusicMode != MUSICMODE_FRONTEND) + field_399C = true; + } +} - if (result > m_aTracks[track].m_nLength) result %= m_aTracks[track].m_nLength; - return result; +void +cMusicManager::StopFrontEndTrack() +{ + if (m_nUpcomingMusicMode == MUSICMODE_FRONTEND || m_nMusicMode == MUSICMODE_FRONTEND) + m_nFrontendTrack = NO_TRACK; } +void +cMusicManager::PlayAnnouncement(uint32 announcement) +{ + if (IsInitialised() && !m_bDisabled && !m_bAnnouncementInProgress) + m_nAnnouncement = announcement; +} -bool -cMusicManager::UsesPoliceRadio(CVehicle *veh) +uint32 +cMusicManager::GetNextCarTuning() { - switch (veh->GetModelIndex()) - { - case MI_VCNMAV: - case MI_POLMAV: - case MI_COASTG: - case MI_RHINO: - case MI_BARRACKS: - return true; - case MI_MRWHOOP: - case MI_HUNTER: - return false; + CVehicle *veh = AudioManager.FindVehicleOfPlayer(); + if (veh == nil) return STREAMED_SOUND_CITY_AMBIENT; + if (UsesPoliceRadio(veh)) return STREAMED_SOUND_RADIO_POLICE; + if (UsesTaxiRadio(veh)) return STREAMED_SOUND_RADIO_TAXI; + if (gNumRetunePresses != 0) { + veh->m_nRadioStation += gNumRetunePresses; + while (veh->m_nRadioStation >= RADIO_OFF) + veh->m_nRadioStation -= RADIO_OFF; + DMAudio.IsMP3RadioChannelAvailable(); // woof, just call and do nothing =P + gNumRetunePresses = 0; } - return veh->UsesSiren(); + return veh->m_nRadioStation; } -void -cMusicManager::ServiceAmbience() +uint32 +cMusicManager::GetCarTuning() { - uint8 volume; + CVehicle* veh = AudioManager.FindVehicleOfPlayer(); + if (veh == nil) return STREAMED_SOUND_CITY_AMBIENT; + if (UsesPoliceRadio(veh)) return STREAMED_SOUND_RADIO_POLICE; + if (UsesTaxiRadio(veh)) return STREAMED_SOUND_RADIO_TAXI; + if (veh->m_nRadioStation == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) + veh->m_nRadioStation = AudioManager.GetRandomNumber(2) % USERTRACK; + return veh->m_nRadioStation; +} - if (m_bAnnouncementInProgress) { - m_nAnnouncement = NO_STREAMED_SOUND; - m_bAnnouncementInProgress = false; - } - if (m_nCurrentStreamedSound < STREAMED_SOUND_CITY_AMBIENT) { - if (SampleManager.IsStreamPlaying(0)) { - m_aTracks[m_nCurrentStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - SampleManager.StopStreamedFile(0); - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - return; - } - m_nCurrentStreamedSound = STREAMED_SOUND_CITY_AMBIENT; - } - if (CWorld::Players[CWorld::PlayerInFocus].m_WBState != WBSTATE_PLAYING && !SampleManager.IsStreamPlaying(0)) { - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - return; - } +float* +cMusicManager::GetListenTimeArray() +{ + return aListenTimeArray; +} - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = TheCamera.DistanceToWater <= 45.0f ? STREAMED_SOUND_WATER_AMBIENT : STREAMED_SOUND_CITY_AMBIENT; +uint32 cMusicManager::GetTrackStartPos(uint32 track) +{ + if (!IsInitialised()) return 0; - if (m_nCurrentStreamedSound == m_nPreviousStreamedSound) { - ComputeAmbienceVol(false, volume); - SampleManager.SetStreamedVolumeAndPan(volume, 63, 1, 0); - if (m_bDontServiceAmbienceTrack) { - if (SampleManager.IsStreamPlaying(0)) - m_bDontServiceAmbienceTrack = false; - } else ServiceTrack(); - } else { - if (m_nPreviousStreamedSound < TOTAL_STREAMED_SOUNDS) { - m_aTracks[m_nPreviousStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nPreviousStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - SampleManager.StopStreamedFile(0); - } - uint32 pos = GetTrackStartPos(m_nCurrentStreamedSound); - SampleManager.SetStreamedVolumeAndPan(0, 63, 1, 0); - if (SampleManager.StartStreamedFile(m_nCurrentStreamedSound, pos, 0)) { - ComputeAmbienceVol(true, volume); - SampleManager.SetStreamedVolumeAndPan(volume, 63, 1, 0); - m_bDontServiceAmbienceTrack = true; - } else - m_nCurrentStreamedSound = NO_STREAMED_SOUND; - } + uint32 pos = m_aTracks[track].m_nPosition; + if (CTimer::GetTimeInMillisecondsPauseMode() > m_aTracks[track].m_nLastPosCheckTimer) + pos += Min(CTimer::GetTimeInMillisecondsPauseMode() - m_aTracks[track].m_nLastPosCheckTimer, 270000); + else + m_aTracks[track].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + + if (pos > m_aTracks[track].m_nLength) + pos %= m_aTracks[track].m_nLength; + return pos; } -void -cMusicManager::ComputeAmbienceVol(uint8 reset, uint8 &outVolume) +uint32 +cMusicManager::GetRadioPosition(uint32 station) { - static float fVol = 0.0f; + if (station < STREAMED_SOUND_CITY_AMBIENT) + return GetTrackStartPos(station); + return 0; +} - if (reset) - fVol = 0.0f; - else if (fVol < 60.0f) - fVol += 1.0f; +uint32 +cMusicManager::GetFavouriteRadioStation() +{ + uint32 favstation = 0; - if (TheCamera.DistanceToWater > 70.0f) - outVolume = fVol; - else if (TheCamera.DistanceToWater > 45.0f) - outVolume = (TheCamera.DistanceToWater - 45.0f) / 25.0f * fVol; - else if (TheCamera.DistanceToWater > 20.0f) - outVolume = (45.0f - TheCamera.DistanceToWater) / 25.0f * fVol; - else - outVolume = fVol; + for (int i = 1; i < NUM_RADIOS; i++) { + if (aListenTimeArray[i] > aListenTimeArray[favstation]) + favstation = i; + } + + return favstation; +} + +bool +cMusicManager::CheckForMusicInterruptions() +{ + return (m_nPlayingTrack == STREAMED_SOUND_MISSION_COMPLETED) || (m_nPlayingTrack == STREAMED_SOUND_CUTSCENE_FINALE); } void -cMusicManager::ServiceTrack() +cMusicManager::SetMalibuClubTrackPos(uint8 scriptObject) { - if (m_bDoTrackService) { - if (!SampleManager.IsStreamPlaying(0)) - SampleManager.StartStreamedFile(m_nCurrentStreamedSound, 0, 0); + if (!IsInitialised()) + m_aTracks[STREAMED_SOUND_MALIBU_AMBIENT].m_nPosition = 8640; + if (m_nStreamedTrack != STREAMED_SOUND_MALIBU_AMBIENT && m_nPlayingTrack != STREAMED_SOUND_MALIBU_AMBIENT) { + switch (scriptObject) + { + case SCRIPT_SOUND_MALIBU_1: + m_aTracks[STREAMED_SOUND_MALIBU_AMBIENT].m_nPosition = (AudioManager.m_anRandomTable[0] % 128) + 8640; + break; + case SCRIPT_SOUND_MALIBU_2: + m_aTracks[STREAMED_SOUND_MALIBU_AMBIENT].m_nPosition = (AudioManager.m_anRandomTable[0] % 128) + 286720; + break; + case SCRIPT_SOUND_MALIBU_3: + m_aTracks[STREAMED_SOUND_MALIBU_AMBIENT].m_nPosition = (AudioManager.m_anRandomTable[0] % 128) + 509120; + break; + } + m_aTracks[STREAMED_SOUND_MALIBU_AMBIENT].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); } } -bool -cMusicManager::ServiceAnnouncement() +void +cMusicManager::SetStripClubTrackPos(uint8 scriptObject) { - static int8 cCheck = 0; - if (m_bAnnouncementInProgress) { - if (!SampleManager.IsStreamPlaying(0)) { - m_nAnnouncement = NO_STREAMED_SOUND; - m_bAnnouncementInProgress = false; + if (!IsInitialised()) + m_aTracks[STREAMED_SOUND_STRIPCLUB_AMBIENT].m_nPosition = 0; + if (m_nStreamedTrack != STREAMED_SOUND_STRIPCLUB_AMBIENT && m_nPlayingTrack != STREAMED_SOUND_STRIPCLUB_AMBIENT) + { + switch (scriptObject) + { + case SCRIPT_SOUND_STRIPCLUB_1: + m_aTracks[STREAMED_SOUND_STRIPCLUB_AMBIENT].m_nPosition = AudioManager.m_anRandomTable[0] % 128; + break; + case SCRIPT_SOUND_STRIPCLUB_2: + m_aTracks[STREAMED_SOUND_STRIPCLUB_AMBIENT].m_nPosition = (AudioManager.m_anRandomTable[0] % 128) + 320200; + break; + case SCRIPT_SOUND_STRIPCLUB_3: + m_aTracks[STREAMED_SOUND_STRIPCLUB_AMBIENT].m_nPosition = (AudioManager.m_anRandomTable[0] % 128) + 672000; + break; } - return true; + m_aTracks[STREAMED_SOUND_STRIPCLUB_AMBIENT].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); } +} - if (++cCheck >= 30) { - cCheck = 0; - int pos = SampleManager.GetStreamedFilePosition(0); - if (SampleManager.IsStreamPlaying(0)) { - if (m_nCurrentStreamedSound != NO_STREAMED_SOUND) { - m_aTracks[m_nCurrentStreamedSound].m_nPosition = pos; - m_aTracks[m_nCurrentStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - SampleManager.StopStreamedFile(0); +void +cMusicManager::DisplayRadioStationName() +{ + int8 gStreamedSound; + static wchar *pCurrentStation = nil; + static uint8 cDisplay = 0; + + if(!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && PlayerInCar() && + !CReplay::IsPlayingBack()) { + CVehicle *vehicle = AudioManager.FindVehicleOfPlayer(); + + if (vehicle) + { + uint8 track; + gStreamedSound = vehicle->m_nRadioStation; + if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT) + gStreamedSound = STREAMED_SOUND_CITY_AMBIENT; + if (gNumRetunePresses != 0) + { + track = gNumRetunePresses + gStreamedSound; + while (track >= RADIO_OFF) track -= RADIO_OFF; + if (!DMAudio.IsMP3RadioChannelAvailable() && track == USERTRACK) + gNumRetunePresses++; } - } + else + track = m_nFrontendTrack; + + + wchar* string = nil; + switch (track) { + case WILDSTYLE: string = TheText.Get("FEA_FM0"); break; + case FLASH_FM: string = TheText.Get("FEA_FM1"); break; + case KCHAT: string = TheText.Get("FEA_FM2"); break; + case FEVER: string = TheText.Get("FEA_FM3"); break; + case V_ROCK: string = TheText.Get("FEA_FM4"); break; + case VCPR: string = TheText.Get("FEA_FM5"); break; + case RADIO_ESPANTOSO: string = TheText.Get("FEA_FM6"); break; + case EMOTION: string = TheText.Get("FEA_FM7"); break; + case WAVE: string = TheText.Get("FEA_FM8"); break; + case USERTRACK: + if (!SampleManager.IsMP3RadioChannelAvailable()) + return; + string = TheText.Get("FEA_MP3"); break; + default: return; + }; - SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); - if (SampleManager.StartStreamedFile(m_nAnnouncement, 0, 0)) { - SampleManager.SetStreamedVolumeAndPan((AudioManager.IsMissionAudioSamplePlaying(0) || AudioManager.IsMissionAudioSamplePlaying(1)) ? 25 : 100, 63, 0, 0); - m_bAnnouncementInProgress = true; - m_nPreviousStreamedSound = m_nCurrentStreamedSound; - m_nCurrentStreamedSound = m_nAnnouncement; - return true; + if (pCurrentStation != string) { + pCurrentStation = string; + cDisplay = 60; + } + else { + if (cDisplay == 0) return; + cDisplay--; + } + + CFont::SetJustifyOff(); + CFont::SetBackgroundOff(); + CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f)); + CFont::SetPropOn(); + CFont::SetFontStyle(FONT_STANDARD); + CFont::SetCentreOn(); + CFont::SetCentreSize(SCREEN_SCALE_X(640.0f)); + CFont::SetColor(CRGBA(0, 0, 0, 255)); + CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation); + + if (gNumRetunePresses) + CFont::SetColor(CRGBA(102, 133, 143, 255)); + else + CFont::SetColor(CRGBA(147, 196, 211, 255)); + + CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_SCALE_Y(22.0f), pCurrentStation); + CFont::DrawFonts(); } + } +} - if (cCheck != 0) cCheck--; - else cCheck = 30; +bool +cMusicManager::UsesPoliceRadio(CVehicle *veh) +{ + switch (veh->GetModelIndex()) + { + case MI_VCNMAV: + case MI_POLMAV: + case MI_COASTG: + case MI_RHINO: + case MI_BARRACKS: + return true; + case MI_MRWHOOP: + case MI_HUNTER: return false; } - - return false; + return veh->UsesSiren(); } -uint32 -cMusicManager::GetCarTuning() +bool +cMusicManager::UsesTaxiRadio(CVehicle *veh) { - CVehicle *veh = FindPlayerVehicle(); - if (veh == nil) return RADIO_OFF; - if (UsesPoliceRadio(veh)) return POLICE_RADIO; - if (veh->m_nRadioStation == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) - veh->m_nRadioStation = AudioManager.GetRandomNumber(2) % USERTRACK; - return veh->m_nRadioStation; + if (veh->GetModelIndex() != MI_KAUFMAN) return false; + return CTheScripts::bPlayerHasMetDebbieHarry; } -uint32 -cMusicManager::GetNextCarTuning() +void +cMusicManager::ServiceAmbience() { - CVehicle *veh = FindPlayerVehicle(); - if (veh == nil) return RADIO_OFF; - if (UsesPoliceRadio(veh)) return STREAMED_SOUND_RADIO_POLICE; - if (gNumRetunePresses != 0) { - if (SampleManager.IsMP3RadioChannelAvailable()) { - if (veh->m_nRadioStation == RADIO_OFF) - veh->m_nRadioStation = POLICE_RADIO; - veh->m_nRadioStation += gNumRetunePresses; - if (veh->m_nRadioStation == POLICE_RADIO) - veh->m_nRadioStation = RADIO_OFF; - else if (veh->m_nRadioStation > POLICE_RADIO) - veh->m_nRadioStation -= RADIO_OFF; - } else if (gNumRetunePresses + veh->m_nRadioStation >= USERTRACK) { - while (gNumRetunePresses) { - if (veh->m_nRadioStation == RADIO_OFF) - veh->m_nRadioStation = WILDSTYLE; - else if (veh->m_nRadioStation < USERTRACK) - ++veh->m_nRadioStation; - - if (veh->m_nRadioStation == USERTRACK) - veh->m_nRadioStation = RADIO_OFF; - --gNumRetunePresses; - } - } else - veh->m_nRadioStation += gNumRetunePresses; - gNumRetunePresses = 0; - } - return veh->m_nRadioStation; } bool cMusicManager::ChangeRadioChannel() { - if (m_nCurrentStreamedSound != m_nPreviousStreamedSound) { - if (m_nPreviousStreamedSound < TOTAL_STREAMED_SOUNDS) { - m_aTracks[m_nPreviousStreamedSound].m_nPosition = SampleManager.GetStreamedFilePosition(0); - m_aTracks[m_nPreviousStreamedSound].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); - SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0); - SampleManager.StopStreamedFile(0); - } - if (SampleManager.IsStreamPlaying(0)) - return false; - if (!SampleManager.StartStreamedFile(m_nCurrentStreamedSound, GetTrackStartPos(m_nCurrentStreamedSound), 0)) - return false; - SampleManager.SetStreamedVolumeAndPan((AudioManager.IsMissionAudioSamplePlaying(0) || AudioManager.IsMissionAudioSamplePlaying(1)) ? 25 : 100, 63, 0, 0); - } return true; } + +// these two are empty +void cMusicManager::Enable() {} +void cMusicManager::Disable() {}
\ No newline at end of file diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h index 217b037b..e1bee497 100644 --- a/src/audio/MusicManager.h +++ b/src/audio/MusicManager.h @@ -11,41 +11,53 @@ public: }; class CVehicle; +class CPed; class cMusicManager { public: bool m_bIsInitialised; bool m_bDisabled; - uint8 m_nMusicMode; - uint32 m_nCurrentStreamedSound; - uint32 m_nPreviousStreamedSound; - bool m_bFrontendTrackFinished; - bool m_bPlayInFrontend; - bool m_bSetNextStation; + bool field_2; + uint8 m_nVolumeLatency; + uint8 m_nCurrentVolume; + uint8 m_nMaxVolume; uint32 m_nAnnouncement; - bool m_bPreviousPlayerInCar; - bool m_bPlayerInCar; bool m_bAnnouncementInProgress; tStreamedSample m_aTracks[TOTAL_STREAMED_SOUNDS]; bool m_bResetTimers; uint32 m_nResetTime; - uint32 m_nLastTrackServiceTime; - uint32 m_nTimer; - bool m_bDoTrackService; - bool m_bIgnoreTimeDelay; - bool m_bDontServiceAmbienceTrack; bool m_bRadioSetByScript; - uint32 m_nRadioStation; - int32 m_nRadioPosition; + uint8 m_nRadioStation; + uint32 m_nRadioPosition; uint32 m_nRadioInCar; + uint32 m_nFrontendTrack; + uint32 m_nPlayingTrack; + uint8 m_nUpcomingMusicMode; + uint8 m_nMusicMode; + bool field_398E; + bool field_398F; + uint32 m_nStreamedTrack; + bool field_3994; + bool field_3995; + bool field_3996; + bool field_3997; + int8 field_3998; + bool field_3999; + bool field_399A; + uint8 m_nMusicModeToBeSet; + bool field_399C; + float aListenTimeArray[NUM_RADIOS]; + float m_nLastTrackServiceTime; public: cMusicManager(); bool IsInitialised() { return m_bIsInitialised; } - uint32 GetMusicMode() { return m_nMusicMode; } - uint8 GetCurrentTrack() { return m_nCurrentStreamedSound; } + uint8 GetMusicMode() { return m_nMusicMode; } + uint32 GetCurrentTrack() { return m_nPlayingTrack; } + void ResetMusicAfterReload(); + void SetStartingTrackPositions(uint8 isNewGameTimer); bool Initialise(); void Terminate(); @@ -60,21 +72,20 @@ public: void PreloadCutSceneMusic(uint32); void PlayPreloadedCutSceneMusic(void); void StopCutSceneMusic(void); - uint8 GetRadioInCar(void); + uint32 GetRadioInCar(void); void SetRadioInCar(uint32); - void SetRadioChannelByScript(uint8, int32); - - void ResetMusicAfterReload(); + void SetRadioChannelByScript(uint32, int32); void ResetTimers(int32); void Service(); void ServiceFrontEndMode(); void ServiceGameMode(); void ServiceAmbience(); - void ServiceTrack(); + void ServiceTrack(CVehicle *veh, CPed *ped); bool UsesPoliceRadio(CVehicle *veh); - uint32 GetTrackStartPos(uint8); + bool UsesTaxiRadio(CVehicle *veh); + uint32 GetTrackStartPos(uint32 track); void ComputeAmbienceVol(uint8 reset, uint8& outVolume); bool ServiceAnnouncement(); @@ -82,8 +93,21 @@ public: uint32 GetCarTuning(); uint32 GetNextCarTuning(); bool ChangeRadioChannel(); + void RecordRadioStats(); + void SetUpCorrectAmbienceTrack(); + float *GetListenTimeArray(); + uint32 GetRadioPosition(uint32 station); + uint32 GetFavouriteRadioStation(); + void SetMalibuClubTrackPos(uint8 pos); + void SetStripClubTrackPos(uint8 pos); + bool CheckForMusicInterruptions(); + + void Enable(); + void Disable(); }; VALIDATE_SIZE(cMusicManager, 0x95C); extern cMusicManager MusicManager; +extern bool g_bAnnouncementReadPosAlready; // we have a symbol of this so it was declared in .h +float GetHeightScale();
\ No newline at end of file diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h index 375c4a70..65094555 100644 --- a/src/audio/audio_enums.h +++ b/src/audio/audio_enums.h @@ -27,6 +27,15 @@ enum eMusicMode MUSICMODE_DISABLED, }; +enum ePlayerMood +{ + PLAYER_MOOD_CALM = 0, + PLAYER_MOOD_PISSED_OFF, + PLAYER_MOOD_ANGRY, + PLAYER_MOOD_WISECRACKING, + MAX_PLAYER_MOODS, +}; + enum eStreamedSounds { STREAMED_SOUND_RADIO_WILD, @@ -1254,7 +1263,7 @@ enum eStreamedSounds STREAMED_SOUND_MISSION_BUST_27, STREAMED_SOUND_MISSION_BUST_28, TOTAL_STREAMED_SOUNDS, - NO_STREAMED_SOUND, + NO_TRACK, }; enum AudioEntityHandle { diff --git a/src/audio/sampman.h b/src/audio/sampman.h index 773fbda1..a96704a1 100644 --- a/src/audio/sampman.h +++ b/src/audio/sampman.h @@ -117,15 +117,19 @@ class cSampleManager { uint8 m_nEffectsVolume; uint8 m_nMusicVolume; + uint8 m_nMP3BoostVolume; uint8 m_nEffectsFadeVolume; uint8 m_nMusicFadeVolume; uint8 m_nMonoMode; - char unk; char m_szCDRomRootPath[80]; bool m_bInitialised; uint8 m_nNumberOfProviders; char *m_aAudioProviders[MAXPROVIDERS]; tSample m_aSamples[TOTAL_AUDIO_SAMPLES]; + char m_MiscomPath[260]; + char m_SfxPath[260]; + char m_StreamedAudioPath[188]; + void *m_aChannels[18]; public: @@ -145,6 +149,8 @@ public: int8 GetCurrent3DProviderIndex(void); int8 SetCurrent3DProvider(uint8 which); + + int8 AutoDetect3DProviders(); bool IsMP3RadioChannelAvailable(void); @@ -165,6 +171,7 @@ public: void SetEffectsMasterVolume(uint8 nVolume); void SetMusicMasterVolume (uint8 nVolume); + void SetMP3BoostVolume (uint8 nVolume); void SetEffectsFadeVolume (uint8 nVolume); void SetMusicFadeVolume (uint8 nVolume); void SetMonoMode (uint8 nMode); @@ -213,6 +220,9 @@ public: void Service(void); #endif bool InitialiseSampleBanks(void); + + uint8 GetMusicVolume() const { return m_nMusicVolume; } + void SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nStream); }; extern cSampleManager SampleManager; diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index d6bb1975..537c3aef 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -61,6 +61,7 @@ char _mp3DirectoryPath[MAX_PATH]; HSTREAM mp3Stream [MAX_STREAMS]; int8 nStreamPan [MAX_STREAMS]; int8 nStreamVolume[MAX_STREAMS]; +uint8 nStreamLoopedFlag[MAX_STREAMS]; uint32 _CurMP3Index; int32 _CurMP3Pos; bool _bIsMp3Active; @@ -407,6 +408,63 @@ cSampleManager::SetCurrent3DProvider(uint8 nProvider) return curprovider; } +int8 +cSampleManager::AutoDetect3DProviders() +{ + if (!AudioManager.IsAudioInitialised()) + return -1; + + int eax = -1, eax2 = -1, eax3 = -1, ds3dh = -1, ds3ds = -1; + + for (uint32 i = 0; i < GetNum3DProvidersAvailable(); i++) + { + char* providername = Get3DProviderName(i); + + if (!strcasecmp(providername, "CREATIVE LABS EAX (TM)")) { + AudioManager.SetCurrent3DProvider(i); + if (GetCurrent3DProviderIndex() == i) + eax = i; + } + + if (!strcasecmp(providername, "CREATIVE LABS EAX 2 (TM)")) { + AudioManager.SetCurrent3DProvider(i); + if (GetCurrent3DProviderIndex() == i) + eax2 = i; + } + + if (!strcasecmp(providername, "CREATIVE LABS EAX 3 (TM)")) { + AudioManager.SetCurrent3DProvider(i); + if (GetCurrent3DProviderIndex() == i) { + eax3 = i; + } + } + + if (!strcasecmp(providername, "DIRECTSOUND3D HARDWARE SUPPORT")) { + AudioManager.SetCurrent3DProvider(i); + if (GetCurrent3DProviderIndex() == i) + ds3dh = i; + } + + if (!strcasecmp(providername, "DIRECTSOUND3D SOFTWARE EMULATION")) { + AudioManager.SetCurrent3DProvider(i); + if (GetCurrent3DProviderIndex() == i) + ds3ds = i; + } + } + + if (eax3 != -1) + return eax3; + if (eax2 != -1) + return eax2; + if (eax != -1) + return eax; + if (ds3dh != -1) + return ds3dh; + if (ds3ds != -1) + return ds3ds; + return -1; +} + static bool _ResolveLink(char const *path, char *out) { @@ -1456,6 +1514,12 @@ cSampleManager::SetMusicMasterVolume(uint8 nVolume) } void +cSampleManager::SetMP3BoostVolume(uint8 nVolume) +{ + m_nMP3BoostVolume = nVolume; +} + +void cSampleManager::SetEffectsFadeVolume(uint8 nVolume) { m_nEffectsFadeVolume = nVolume; @@ -2132,7 +2196,8 @@ cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream) AIL_open_stream(DIG, filename, 0); if(mp3Stream[nStream]) { AIL_set_stream_loop_count( - mp3Stream[nStream], 1); + mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1); + nStreamLoopedFlag[nStream] = true; AIL_set_stream_ms_position( mp3Stream[nStream], position); AIL_pause_stream(mp3Stream[nStream], @@ -2387,4 +2452,12 @@ cSampleManager::InitialiseSampleBanks(void) return true; } + +void +cSampleManager::SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nChannel) +{ + if (m_bInitialised) + nStreamLoopedFlag[nChannel] = nLoopFlag; +} + #endif
\ No newline at end of file diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp index 3638e6fb..7aab0d09 100644 --- a/src/audio/sampman_null.cpp +++ b/src/audio/sampman_null.cpp @@ -114,6 +114,11 @@ cSampleManager::SetMusicMasterVolume(uint8 nVolume) } void +cSampleManager::SetMusicMasterVolume(uint8 nVolume) +{ +} + +void cSampleManager::SetEffectsFadeVolume(uint8 nVolume) { } @@ -365,4 +370,14 @@ cSampleManager::InitialiseSampleBanks(void) return true; } +void +cSampleManager::SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nChannel) +{ +} + +int8 cSampleManager::AutoDetect3DProviders() +{ + return -1; +} + #endif diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 1e9f60fd..0b59766f 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -131,6 +131,7 @@ uint32 nNumMP3s; CStream *aStream[MAX_STREAMS]; uint8 nStreamPan [MAX_STREAMS]; uint8 nStreamVolume[MAX_STREAMS]; +uint8 nStreamLoopedFlag[MAX_STREAMS]; /////////////////////////////////////////////////////////////// // Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS @@ -468,6 +469,38 @@ int8 cSampleManager::SetCurrent3DProvider(uint8 nProvider) return curprovider; } +int8 +cSampleManager::AutoDetect3DProviders() +{ + if (!AudioManager.IsAudioInitialised()) + return -1; + + int eax = -1, eax2 = -1, eax3 = -1, ds3dh = -1, ds3ds = -1; + + for (uint32 i = 0; i < GetNum3DProvidersAvailable(); i++) + { + char* providername = Get3DProviderName(i); + + if (!strcasecmp(providername, "OPENAL SOFT")) { + SetCurrent3DProvider(i); + if (GetCurrent3DProviderIndex() == i) + return i; + } + } + + if (eax3 != -1) + return eax3; + if (eax2 != -1) + return eax2; + if (eax != -1) + return eax; + if (ds3dh != -1) + return ds3dh; + if (ds3ds != -1) + return ds3ds; + return -1; +} + bool cSampleManager::IsMP3RadioChannelAvailable(void) { @@ -730,6 +763,12 @@ cSampleManager::SetMusicMasterVolume(uint8 nVolume) } void +cSampleManager::SetMP3BoostVolume(uint8 nVolume) +{ + m_nMP3BoostVolume = nVolume; +} + +void cSampleManager::SetEffectsFadeVolume(uint8 nVolume) { m_nEffectsFadeVolume = nVolume; @@ -1468,4 +1507,11 @@ cSampleManager::InitialiseSampleBanks(void) return true; } +void +cSampleManager::SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nChannel) +{ + if (m_bInitialised) + nStreamLoopedFlag[nChannel] = nLoopFlag; +} + #endif diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h index bc9ac09a..bc5d3ba9 100644 --- a/src/audio/soundlist.h +++ b/src/audio/soundlist.h @@ -252,12 +252,15 @@ enum eScriptSounds : uint16 { SCRIPT_SOUND_SAWMILL_LOOP_L, SCRIPT_SOUND_38, SCRIPT_SOUND_39, - SCRIPT_SOUND_LAUNDERETTE_LOOP_S, - SCRIPT_SOUND_LAUNDERETTE_LOOP_L, - SCRIPT_SOUND_CHINATOWN_RESTAURANT_S, - SCRIPT_SOUND_CHINATOWN_RESTAURANT_L, - SCRIPT_SOUND_CIPRIANI_RESAURANT_S, - SCRIPT_SOUND_CIPRIANI_RESAURANT_L, + + // MIAMI: only these are true so far + SCRIPT_SOUND_MALIBU_1, + SCRIPT_SOUND_MALIBU_2, + SCRIPT_SOUND_MALIBU_3, + SCRIPT_SOUND_STRIPCLUB_1, + SCRIPT_SOUND_STRIPCLUB_2, + SCRIPT_SOUND_STRIPCLUB_3, + SCRIPT_SOUND_46_S, SCRIPT_SOUND_47_L, SCRIPT_SOUND_MARCO_BISTRO_S, |