Distrib file updates; test for bitmap presence in controls.cpp

[wxWidgets.git] / utils / wxMMedia2 / lib / sndwin.cpp

diff --git a/utils/wxMMedia2/lib/sndwin.cpp b/utils/wxMMedia2/lib/sndwin.cpp
index d89af5f82a84728e3f899faad013cb79c9bd78a7..0d070fce806c899cc251c054202b6cadac30b9e7 100644 (file)
--- a/utils/wxMMedia2/lib/sndwin.cpp
+++ b/utils/wxMMedia2/lib/sndwin.cpp
@@ -21,7 +21,7 @@
 typedef struct _wxSoundInternal wxSoundInternal;
 typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
 
-extern char wxCanvasClassName[];
+extern const wxChar *wxCanvasClassName;
 
 wxList *wxSoundHandleList = NULL;
 
@@ -51,7 +51,7 @@ struct _wxSoundInfoHeader {
   wxSoundStreamWin *m_driver;
 };
 
-#define WXSOUND_MAX_QUEUE 128
+#define WXSOUND_MAX_QUEUE 10
 
 wxSoundStreamWin::wxSoundStreamWin()
 {
@@ -59,12 +59,22 @@ wxSoundStreamWin::wxSoundStreamWin()
 
   m_production_started = FALSE;
   m_internal = new wxSoundInternal;
+  if (!m_internal) {
+    m_snderror = wxSOUND_MEMERR;
+    m_internal = NULL;
+    return;
+  }
   m_snderror = wxSOUND_NOERR;
 
   // Setup defaults
   CreateSndWindow();
   SetSoundFormat(pcm);
 
+  m_internal->m_input_enabled = FALSE;
+  m_internal->m_output_enabled = FALSE;
+
+  m_waiting_for = FALSE;
+
   if (!OpenDevice(wxSOUND_OUTPUT))
     return;
 
@@ -73,21 +83,31 @@ wxSoundStreamWin::wxSoundStreamWin()
 
 wxSoundStreamWin::~wxSoundStreamWin()
 {
-  if (m_production_started)
-    StopProduction();
-  DestroySndWindow();
+  if (m_internal) {
+    if (m_production_started)
+      StopProduction();
+    DestroySndWindow();
 
-  delete m_internal;
+    delete m_internal;
+  }
 }
 
 LRESULT APIENTRY _EXPORT _wxSoundHandlerWndProc(HWND hWnd, UINT message,
                  WPARAM wParam, LPARAM lParam)
 {
+  wxSoundStreamWin *sndwin;
+
+  sndwin = wxFindSoundFromHandle((WXHWND)hWnd);
+  if (!sndwin)
+    return (LRESULT)0;
+
   switch (message) {
-  case MM_WOM_DONE: {
-    wxFindSoundFromHandle((WXHWND)hWnd)->NotifyDoneBuffer(wParam);
+  case MM_WOM_DONE:
+    sndwin->NotifyDoneBuffer(wParam, wxSOUND_OUTPUT);
+    break;
+  case MM_WIM_DATA:
+    sndwin->NotifyDoneBuffer(wParam, wxSOUND_INPUT);
     break;
-  }
   default:
     break;
   }
@@ -155,9 +175,9 @@ bool wxSoundStreamWin::OpenDevice(int mode)
 
   wformat.wFormatTag      = WAVE_FORMAT_PCM;
   wformat.nChannels       = pcm->GetChannels();
-  wformat.nBlockAlign     = pcm->GetBPS() / 8 * wformat.nChannels;
-  wformat.nAvgBytesPerSec = pcm->GetBytesFromTime(1);
+  wformat.nBlockAlign     = wformat.nChannels * pcm->GetBPS() / 8;
   wformat.nSamplesPerSec  = pcm->GetSampleRate();
+  wformat.nAvgBytesPerSec = wformat.nSamplesPerSec * wformat.nBlockAlign;
   wformat.wBitsPerSample  = pcm->GetBPS();
   wformat.cbSize          = 0;
 
@@ -198,16 +218,25 @@ bool wxSoundStreamWin::OpenDevice(int mode)
       return FALSE;
     }
 
-    m_input_frag_in   = WXSOUND_MAX_QUEUE-1;
-    m_current_frag_in = 0;
+    m_current_frag_in = WXSOUND_MAX_QUEUE-1;
+    m_input_frag_in   = 0;
 
     m_internal->m_input_enabled = TRUE;
   }
 
-  if (!AllocHeaders(mode)) {
-    CloseDevice();
-    return FALSE;
+  if (mode & wxSOUND_OUTPUT) {
+    if (!AllocHeaders(wxSOUND_OUTPUT)) {
+      CloseDevice();
+      return FALSE;
+    }
+  }
+  if (mode & wxSOUND_INPUT) {
+    if (!AllocHeaders(wxSOUND_INPUT)) {
+      CloseDevice();
+      return FALSE;
+    }
   }
+
   return TRUE;
 }
 
@@ -219,18 +248,15 @@ void wxSoundStreamWin::CloseDevice()
 {
   if (m_internal->m_output_enabled) {
     FreeHeaders(wxSOUND_OUTPUT);
-    waveOutReset(m_internal->m_devout);
+    m_internal->m_output_enabled = FALSE;
     waveOutClose(m_internal->m_devout);
   }
 
   if (m_internal->m_input_enabled) {
     FreeHeaders(wxSOUND_INPUT);
-    waveInReset(m_internal->m_devin);
+    m_internal->m_input_enabled  = FALSE;
     waveInClose(m_internal->m_devin);
   }
-
-  m_internal->m_output_enabled = FALSE;
-  m_internal->m_input_enabled  = FALSE;
 }
 
 // -------------------------------------------------------------------------
@@ -277,7 +303,6 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
   header->dwUser         = (DWORD)info;
   header->dwFlags        = WHDR_DONE;
 
-
   // "Prepare" the header
   if (mode == wxSOUND_INPUT) {
     MMRESULT result;
@@ -412,19 +437,25 @@ void wxSoundStreamWin::FreeHeaders(int mode)
 // -------------------------------------------------------------------------
 void wxSoundStreamWin::WaitFor(wxSoundInfoHeader *info)
 {
-  // We begun filling it: we must send it to the Windows queue
-  if (info->m_position != 0) {
-    memset(info->m_data + info->m_position, 0, info->m_size-info->m_position);
-    AddToQueue(info);
+  // If the buffer is finished, we return immediately
+  if (!info->m_playing) {
+
+    // We begun filling it: we must send it to the Windows queue
+    if (info->m_position != 0) {
+      memset(info->m_data + info->m_position, 0, info->m_size);
+      AddToQueue(info);
+    }
   }
 
-  // If the buffer is finished, we return immediately
-  if (!info->m_playing && !info->m_recording)
+  if (m_waiting_for) {
+    // PROBLEM //
     return;
-
+  }
+  m_waiting_for = TRUE;
   // Else, we wait for its termination
   while (info->m_playing || info->m_recording)
     wxYield();
+  m_waiting_for = FALSE;
 }
 
 // -------------------------------------------------------------------------
@@ -443,7 +474,6 @@ bool wxSoundStreamWin::AddToQueue(wxSoundInfoHeader *info)
 
   if (info->m_mode == wxSOUND_INPUT) {
     // Increment the input fragment pointer
-    m_current_frag_in = (m_current_frag_in + 1) % WXSOUND_MAX_QUEUE;
     result = waveInAddBuffer(m_internal->m_devin,
                              info->m_header, sizeof(WAVEHDR));
     if (result == MMSYSERR_NOERROR)
@@ -537,9 +567,11 @@ wxSoundInfoHeader *wxSoundStreamWin::NextFragmentInput()
 {
   wxSoundInfoHeader *header;
 
-  // TODO //
+  m_current_frag_in = (m_current_frag_in + 1) % WXSOUND_MAX_QUEUE;
+
   header = m_headers_rec[m_current_frag_in];
-  WaitFor(header);
+  if (header->m_recording)
+    WaitFor(header);
 
   if (m_current_frag_in == m_input_frag_in)
     m_queue_filled = TRUE;
@@ -589,19 +621,28 @@ wxSoundStream& wxSoundStreamWin::Read(void *buffer, wxUint32 len)
 // fragment finished. It reinitializes the parameters of the fragment and
 // sends an event to the clients.
 // -------------------------------------------------------------------------
-void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 dev_handle)
+void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 dev_handle, int flag)
 {
   wxSoundInfoHeader *info;
 
-  if (dev_handle == (wxUint32)m_internal->m_devout) {
+  if (flag == wxSOUND_OUTPUT) {
+    if (!m_internal->m_output_enabled)
+      return;
+
     m_output_frag_out = (m_output_frag_out + 1) % WXSOUND_MAX_QUEUE;
     info = m_headers_play[m_output_frag_out];
     ClearHeader(info);
     m_queue_filled = FALSE;
-    OnSoundEvent(wxSOUND_OUTPUT);
+    if (!m_waiting_for)
+      OnSoundEvent(wxSOUND_OUTPUT);
   } else {
+    if (!m_internal->m_input_enabled)
+      return;
+
+    m_headers_rec[m_input_frag_in]->m_recording = FALSE;
     m_input_frag_in = (m_input_frag_in + 1) % WXSOUND_MAX_QUEUE;
-    OnSoundEvent(wxSOUND_INPUT);
+    if (!m_waiting_for)
+      OnSoundEvent(wxSOUND_INPUT);
     m_queue_filled = FALSE;
   }
 }
@@ -617,6 +658,9 @@ bool wxSoundStreamWin::SetSoundFormat(wxSoundFormatBase& base)
 // -------------------------------------------------------------------------
 bool wxSoundStreamWin::StartProduction(int evt)
 {
+  if (!m_internal)
+    return FALSE;
+
   if ((m_internal->m_output_enabled && (evt & wxSOUND_OUTPUT)) ||
       (m_internal->m_input_enabled && (evt & wxSOUND_INPUT)))
     CloseDevice();
@@ -628,12 +672,14 @@ bool wxSoundStreamWin::StartProduction(int evt)
   m_queue_filled = FALSE;
   // Send a dummy event to start.
   if (evt & wxSOUND_OUTPUT)
-    OnSoundEvent(evt);
+    OnSoundEvent(wxSOUND_OUTPUT);
 
   if (evt & wxSOUND_INPUT) {
     int i;
     for (i=0;i<WXSOUND_MAX_QUEUE;i++)
       AddToQueue(m_headers_rec[i]);
+
+    waveInStart(m_internal->m_devin);
   }
 
   return TRUE;
@@ -643,6 +689,9 @@ bool wxSoundStreamWin::StartProduction(int evt)
 // -------------------------------------------------------------------------
 bool wxSoundStreamWin::StopProduction()
 {
+  if (!m_production_started)
+    return FALSE;
+
   m_production_started = FALSE;
   CloseDevice();
   return TRUE;