X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d6306eb4da8cdac4b5dee9784959672c233eec8..d9f39e09e82e99c422619f4e3df536d0a9e87987:/utils/wxMMedia/snduss.cpp

diff --git a/utils/wxMMedia/snduss.cpp b/utils/wxMMedia/snduss.cpp
index c98a741a12..a0947d1504 100644
--- a/utils/wxMMedia/snduss.cpp
+++ b/utils/wxMMedia/snduss.cpp
@@ -16,7 +16,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
-#include <dmalloc.h>
 
 #include "wx/app.h"
 #include "wx/utils.h"
@@ -50,7 +49,8 @@ wxUssSound::~wxUssSound()
       m_sleep_cond.Signal();
       m_sleep_mtx.Unlock();
     }
-    Join();
+    while (IsAlive())
+      Yield();
   }
 
   if (m_fd != -1)
@@ -104,11 +104,9 @@ void wxUssSound::USS_Sleep()
 bool wxUssSound::DoInput(wxSndBuffer *buf)
 {
   wxUint32 bufsize;
-  wxSoundCodec *codec = buf->GetFormat().GetCodec();
+  wxSoundCodec *codec = buf->GetCurrentCodec();
 
   m_sndbuf->ResetBuffer();
-  codec->SetInStream(m_sndbuf);
-  codec->InitIO(m_ussformat);
 
   bufsize = codec->Available();
   if (bufsize > m_max_bufsize)
@@ -118,7 +116,7 @@ bool wxUssSound::DoInput(wxSndBuffer *buf)
     buf->Clear(wxSND_BUFLOCKED | wxSND_BUFREADY);
     return false;
   }
-  read(m_fd, m_sndbuf, bufsize);
+  read(m_fd, m_sndbuf->GetBufferStart(), bufsize);
   codec->Encode();
 
   return true;
@@ -129,20 +127,46 @@ bool wxUssSound::DoOutput(wxSndBuffer *buf)
   wxSoundCodec *codec = buf->GetCurrentCodec();
 
   m_sndbuf->ResetBuffer();
-  codec->SetOutStream(m_sndbuf);
-  codec->InitIO(m_ussformat);
 
   if (!codec->Available()) {
     buf->Clear(wxSND_BUFLOCKED | wxSND_BUFREADY);
-    return false;
+    return FALSE;
   }
   codec->Decode();
-  write(m_fd, m_sndbuf, m_sndbuf->GetIntPosition());
+  write(m_fd, m_sndbuf->GetBufferStart(), m_sndbuf->GetIntPosition());
 
   // Well ... it's not accurate ! :-|
   buf->OnBufferOutFinished();
 
-  return true;
+  return TRUE;
+}
+
+bool wxUssSound::InitBuffer(wxSndBuffer *buf)
+{
+  wxSoundCodec *codec;
+
+  if (!OnSetupDriver(*buf, buf->GetMode())) {
+    if (buf->IsNotSet(wxSND_BUFREADY))
+      return FALSE;
+  }
+
+  codec = buf->GetCurrentCodec();
+  switch (m_mode) {
+  case wxSND_INPUT:
+    codec->SetInStream(m_sndbuf);
+    codec->InitIO(m_ussformat);
+    codec->InitMode(wxSoundCodec::ENCODING);
+    break;
+  case wxSND_OUTPUT:
+    codec->SetOutStream(m_sndbuf);
+    codec->InitIO(m_ussformat);
+    codec->InitMode(wxSoundCodec::DECODING);
+    break;
+  case wxSND_DUPLEX:
+  case wxSND_OTHER_IO:
+    break; 
+  }
+  return TRUE;
 }
 
 void *wxUssSound::Entry()
@@ -150,36 +174,46 @@ void *wxUssSound::Entry()
   wxNode *node;
   wxSndBuffer *buf;
 
-  while (!m_stop_thrd) {
-    node = m_buffers.First();
-    if (!node) {
-      USS_Sleep();
-      continue;
-    }
-    buf = (wxSndBuffer *)node->Data();
-    if (!OnSetupDriver(*buf, buf->GetMode()))
-      continue;
+  node = m_buffers.First();
+  if (!node) {
+    m_stop_thrd = FALSE;
+    return NULL;
+  }
+
+  buf = (wxSndBuffer *)node->Data();
+  InitBuffer(buf);
 
+  while (!m_stop_thrd) {
     buf->HardLock();
     if (buf->IsSet(wxSND_BUFSTOP)) {
       buf->HardUnlock();
-      delete node;
-      continue;
+      goto sound_clean_buffer;
     }
     switch(m_mode) {
     case wxSND_INPUT:
       if (!DoInput(buf))
-        delete node;
+        goto sound_clean_buffer;
       break;
     case wxSND_OUTPUT:
       if (!DoOutput(buf))
-        delete node;
+        goto sound_clean_buffer;
       break;
     case wxSND_DUPLEX:
     case wxSND_OTHER_IO:
+      goto sound_clean_buffer;
       break;
     }
     buf->HardUnlock();
+    continue;
+
+  sound_clean_buffer:
+    buf->GetCurrentCodec()->ExitMode();
+    delete node;
+    node = m_buffers.First();
+    if (!node)
+      USS_Sleep();
+    if (node)
+      buf = (wxSndBuffer *)node->Data();
   }
   return NULL;
 }
@@ -189,7 +223,7 @@ bool wxUssSound::OnSetupDriver(wxSndBuffer& buf, wxSndMode WXUNUSED(mode))
   wxSoundDataFormat format;
   wxSoundCodec *codec;
 
-  codec = buf.GetFormat().GetCodec();
+  codec = buf.GetCurrentCodec();
   format = codec->GetPreferredFormat(WXSOUND_PCM);
 
   if ((format.GetSampleRate() != m_srate) ||
@@ -201,17 +235,17 @@ bool wxUssSound::OnSetupDriver(wxSndBuffer& buf, wxSndMode WXUNUSED(mode))
       m_buffers.DeleteObject(&buf);
       buf.Clear(wxSND_BUFLOCKED | wxSND_BUFREADY);
       buf.SetError(wxSND_CANTSET);
-      return false;
+      return FALSE;
     }
     m_mode = wxSND_OTHER_IO;
   }
 
   if (buf.GetMode() != m_mode) {
     m_mode = buf.GetMode();
-    return false;
+    return FALSE;
   }
 
-  return true;
+  return TRUE;
 }
 
 wxUint32 wxUssSound::GetNbFragments()