Commit b251876126e07891122abde462114d867d957204
2018-10-01T09:47:10
commit c6b28f46b8116552ec2b38d1d3c8535df28ba7a1 Author: Anthony Pesch <inolen@gmail.com> Date: Fri May 4 20:21:21 2018 -0400 Added SDL_AUDIO_ALLOW_SAMPLES_CHANGE flag enabling users of SDL_OpenAudioDevice to get the sample size of the actual hardware buffer vs having a stream created to handle the delta
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/include/SDL_audio.h b/include/SDL_audio.h
index d6ea689..d3e1bfa 100644
--- a/include/SDL_audio.h
+++ b/include/SDL_audio.h
@@ -140,7 +140,8 @@ typedef Uint16 SDL_AudioFormat;
#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001
#define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002
#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004
-#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
+#define SDL_AUDIO_ALLOW_SAMPLES_CHANGE 0x00000008
+#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE|SDL_AUDIO_ALLOW_SAMPLES_CHANGE)
/* @} */
/* @} *//* Audio flags */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 23daf00..2f0854d 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -1324,15 +1324,12 @@ open_audio_device(const char *devname, int iscapture,
build_stream = SDL_TRUE;
}
}
-
- /* !!! FIXME in 2.1: add SDL_AUDIO_ALLOW_SAMPLES_CHANGE flag?
- As of 2.0.6, we will build a stream to buffer the difference between
- what the app wants to feed and the device wants to eat, so everyone
- gets their way. In prior releases, SDL would force the callback to
- feed at the rate the device requested, adjusted for resampling.
- */
if (device->spec.samples != obtained->samples) {
- build_stream = SDL_TRUE;
+ if (allowed_changes & SDL_AUDIO_ALLOW_SAMPLES_CHANGE) {
+ obtained->samples = device->spec.samples;
+ } else {
+ build_stream = SDL_TRUE;
+ }
}
SDL_CalculateAudioSpec(obtained); /* recalc after possible changes. */