games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
This commit is contained in:
Laserlicht
2024-01-26 20:09:17 +01:00
committed by GitHub
parent 28c6385211
commit c426382687
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/CMusicHandler.cpp
View File

@@ -193,7 +193,7 @@ double CSoundHandler::getSoundDuration(const AudioPath & sound)
SDL_AudioSpec spec; SDL_AudioSpec spec;
uint32_t audioLen; uint32_t audioLen;
uint8_t *audioBuf; uint8_t *audioBuf;
double seconds = 0.0; uint32_t miliseconds = 0;
if(SDL_LoadWAV_RW(SDL_RWFromMem(data.first.get(), (int)data.second), 1, &spec, &audioBuf, &audioLen) != nullptr) if(SDL_LoadWAV_RW(SDL_RWFromMem(data.first.get(), (int)data.second), 1, &spec, &audioBuf, &audioLen) != nullptr)
{ {
@@ -201,10 +201,10 @@ double CSoundHandler::getSoundDuration(const AudioPath & sound)
uint32_t sampleSize = SDL_AUDIO_BITSIZE(spec.format) / 8; uint32_t sampleSize = SDL_AUDIO_BITSIZE(spec.format) / 8;
uint32_t sampleCount = audioLen / sampleSize; uint32_t sampleCount = audioLen / sampleSize;
uint32_t sampleLen = sampleCount / spec.channels; uint32_t sampleLen = sampleCount / spec.channels;
seconds = (double)sampleLen / (double)spec.freq; miliseconds = 1000 * sampleLen / spec.freq;
} }
return seconds; return miliseconds ;
} }
// Plays a sound, and return its channel so we can fade it out later // Plays a sound, and return its channel so we can fade it out later

2
client/CMusicHandler.h
View File

@@ -77,7 +77,7 @@ public:
void setChannelVolume(int channel, ui32 percent); void setChannelVolume(int channel, ui32 percent);
// Sounds // Sounds
double getSoundDuration(const AudioPath & sound); uint32_t getSoundDurationMilliseconds(const AudioPath & sound);
int playSound(soundBase::soundID soundID, int repeats=0); int playSound(soundBase::soundID soundID, int repeats=0);
int playSound(const AudioPath & sound, int repeats=0, bool cache=false); int playSound(const AudioPath & sound, int repeats=0, bool cache=false);
int playSound(std::pair<std::unique_ptr<ui8 []>, si64> & data, int repeats=0, bool cache=false); int playSound(std::pair<std::unique_ptr<ui8 []>, si64> & data, int repeats=0, bool cache=false);