summaryrefslogtreecommitdiff
path: root/audio/esdaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/esdaudio.c')
-rw-r--r--audio/esdaudio.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index fa42348849..d91468b9dc 100644
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -84,6 +84,10 @@ static void *qesd_thread_out (void *arg)
threshold = conf.divisor ? hw->samples / conf.divisor : 0;
+ if (audio_pt_lock (&esd->pt, AUDIO_FUNC)) {
+ return NULL;
+ }
+
for (;;) {
int decr, to_mix, rpos;
@@ -215,13 +219,10 @@ static int qesd_init_out (HWVoiceOut *hw, audsettings_t *as)
default:
dolog ("Internal logic error: Bad audio format %d\n", as->fmt);
-#ifdef DEBUG_FMOD
- abort ();
-#endif
goto deffmt;
}
- obt_as.endianness = 0;
+ obt_as.endianness = AUDIO_HOST_ENDIANNESS;
audio_pcm_init_info (&hw->info, &obt_as);
@@ -315,6 +316,10 @@ static void *qesd_thread_in (void *arg)
threshold = conf.divisor ? hw->samples / conf.divisor : 0;
+ if (audio_pt_lock (&esd->pt, AUDIO_FUNC)) {
+ return NULL;
+ }
+
for (;;) {
int incr, to_grab, wpos;
@@ -447,7 +452,7 @@ static int qesd_init_in (HWVoiceIn *hw, audsettings_t *as)
obt_as.fmt = AUD_FMT_S16;
break;
}
- obt_as.endianness = 0;
+ obt_as.endianness = AUDIO_HOST_ENDIANNESS;
audio_pcm_init_info (&hw->info, &obt_as);