commit deb9d2eea7c385c9d19d15be9a7576cbfe9ed5a5
author balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Fri May 02 02:24:55 2008 +0000
committer balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Fri May 02 02:24:55 2008 +0000
tree 5d0e3ad901962a25bdbe49ae70b042b02ac42603
parent b0f6edb18edd30f9eb0d5789ceb78f2f04e95d8f

Audio endianness and mutex usage fixes (malc.git).

From http://repo.or.cz/w/qemu/malc.git?a=shortlog;h=refs/heads/audio :

Implicitly lock the mutex at startup of playback/capture threads, otherwise
pthread_mutex_destroy (in audio_pt_fini) fails with EBUSY.
Endianness fix.
Remove a c&p residue.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4296 c046a42c-6fe2-441c-8c8c-71466251a162

audio/esdaudio.c

diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index fa42348..d91468b 100644
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -84,6 +84,10 @@
 
     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 @@
 
     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 @@
 
     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 @@
         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);