Signed-off-by: Kővágó, Zoltán <dirty.ice...@gmail.com>
---
audio/sdlaudio.c | 102 ++++++++++++++++++++++---------------------------------
1 file changed, 41 insertions(+), 61 deletions(-)
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 26538c8..183ecdd 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -39,9 +39,6 @@
typedef struct SDLVoiceOut {
HWVoiceOut hw;
- int live;
- int rpos;
- int decr;
} SDLVoiceOut;
static struct SDLAudioState {
@@ -230,16 +227,12 @@ static void sdl_callback (void *opaque, Uint8 *buf, int
len)
SDLVoiceOut *sdl = opaque;
SDLAudioState *s = &glob_sdl;
HWVoiceOut *hw = &sdl->hw;
- int samples = len >> hw->info.shift;
if (s->exit) {
return;
}
- while (samples) {
- int to_mix, decr;
-
- /* dolog ("in callback samples=%d\n", samples); */
+ while (len) {
sdl_wait (s, "sdl_callback");
if (s->exit) {
return;
@@ -249,34 +242,23 @@ static void sdl_callback (void *opaque, Uint8 *buf, int
len)
return;
}
- if (audio_bug (AUDIO_FUNC, sdl->live < 0 || sdl->live > hw->samples)) {
- dolog("sdl->live=%d hw->samples=%zu\n",
- sdl->live, hw->samples);
- return;
- }
-
- if (!sdl->live) {
- goto again;
- }
+ while (hw->pending_emul && len) {
+ size_t write_len;
+ ssize_t start = ((ssize_t) hw->pos_emul) - hw->pending_emul;
+ if (start < 0) {
+ start += hw->size_emul;
+ }
+ assert(start >= 0 && start < hw->size_emul);
- /* dolog ("in callback live=%d\n", live); */
- to_mix = MIN (samples, sdl->live);
- decr = to_mix;
- while (to_mix) {
- int chunk = MIN (to_mix, hw->samples - hw->rpos);
- struct st_sample *src = hw->mix_buf + hw->rpos;
+ write_len = MIN(MIN(hw->pending_emul, len),
+ hw->size_emul - start);
- /* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */
- hw->clip (buf, src, chunk);
- sdl->rpos = (sdl->rpos + chunk) % hw->samples;
- to_mix -= chunk;
- buf += chunk << hw->info.shift;
+ memcpy(buf, hw->buf_emul + start, write_len);
+ hw->pending_emul -= write_len;
+ len -= write_len;
+ buf += write_len;
}
- samples -= decr;
- sdl->live -= decr;
- sdl->decr += decr;
- again:
if (sdl_unlock (s, "sdl_callback")) {
return;
}
@@ -284,37 +266,33 @@ static void sdl_callback (void *opaque, Uint8 *buf, int
len)
/* dolog ("done len=%d\n", len); */
}
-static int sdl_run_out (HWVoiceOut *hw, int live)
-{
- int decr;
- SDLVoiceOut *sdl = (SDLVoiceOut *) hw;
- SDLAudioState *s = &glob_sdl;
-
- if (sdl_lock (s, "sdl_run_out")) {
- return 0;
- }
-
- if (sdl->decr > live) {
- ldebug ("sdl->decr %d live %d sdl->live %d\n",
- sdl->decr,
- live,
- sdl->live);
+#define SDL_WRAPPER_FUNC(name, ret_type, args_decl, args, fail, unlock) \
+ static ret_type glue(sdl_, name)args_decl \
+ { \
+ SDLAudioState *s = &glob_sdl; \
+ ret_type ret; \
+ \
+ if (sdl_lock(s, "sdl_" #name)) { \
+ fail; \
+ return 0; /* implicitly casts to NULL */ \
+ } \
+ \
+ ret = glue(audio_generic_, name)args; \
+ \
+ unlock(s, "sdl_" #name); \
+ return ret; \
}
- decr = MIN (sdl->decr, live);
- sdl->decr -= decr;
+SDL_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *size),
+ (hw, size), *size = 0, sdl_unlock)
+SDL_WRAPPER_FUNC(put_buffer_out_nowrite, size_t,
+ (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size),
+ /*nothing*/, sdl_unlock_and_post)
+SDL_WRAPPER_FUNC(write, size_t,
+ (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size),
+ /* nothing */, sdl_unlock_and_post)
- sdl->live = live - decr;
- hw->rpos = sdl->rpos;
-
- if (sdl->live > 0) {
- sdl_unlock_and_post (s, "sdl_run_out");
- }
- else {
- sdl_unlock (s, "sdl_run_out");
- }
- return decr;
-}
+#undef SDL_WRAPPER_FUNC
static void sdl_fini_out (HWVoiceOut *hw)
{
@@ -428,7 +406,9 @@ static void sdl_audio_fini (void *opaque)
static struct audio_pcm_ops sdl_pcm_ops = {
.init_out = sdl_init_out,
.fini_out = sdl_fini_out,
- .run_out = sdl_run_out,
+ .write = sdl_write,
+ .get_buffer_out = sdl_get_buffer_out,
+ .put_buffer_out = sdl_put_buffer_out_nowrite,
.ctl_out = sdl_ctl_out,
};
--
2.5.0
