mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-16 23:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Visual Studio warning 4244

Browse Source
This commit is contained in:
Sam Lantinga
2023-03-30 14:04:32 -07:00
parent 85ee1498a5
commit 308bcbbe76
29 changed files with 160 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio/SDL_audio.c
View File

@@ -1162,7 +1162,7 @@ GetDefaultSamplesFromFreq(int freq)
{
/* Pick a default of ~46 ms at desired frequency */
/* !!! FIXME: remove this when the non-Po2 resampling is in. */
const Uint16 max_sample = (freq / 1000) * 46;
const Uint16 max_sample = (Uint16)((freq / 1000) * 46);
Uint16 current_sample = 1;
while (current_sample < max_sample) {
current_sample *= 2;
@@ -1373,7 +1373,13 @@ static SDL_AudioDeviceID open_audio_device(const char *devname, int iscapture,
* value we got from 'desired' and round up to the nearest value
*/
if (!current_audio.impl.SupportsNonPow2Samples && device->spec.samples > 0) {
device->spec.samples = SDL_powerof2(device->spec.samples);
int samples = SDL_powerof2(device->spec.samples);
if (samples <= SDL_MAX_UINT16) {
device->spec.samples = (Uint16)samples;
} else {
SDL_SetError("Couldn't hold sample count %d\n", samples);
return 0;
}
}
if (current_audio.impl.OpenDevice(device, devname) < 0) {