Sound recording works on Windows

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxMMedia2/lib/sndwin.cpp b/utils/wxMMedia2/lib/sndwin.cpp
index 3dfb2ec139a46079a3dbc83db221edecd862941b..0d67b5ab890a563e58ea74cfad51d59d682a595c 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;
 
@@ -68,6 +68,8 @@ wxSoundStreamWin::wxSoundStreamWin()
   m_internal->m_input_enabled = FALSE;
   m_internal->m_output_enabled = FALSE;
 
+  m_waiting_for = FALSE;
+
   if (!OpenDevice(wxSOUND_OUTPUT))
     return;
 
@@ -209,8 +211,8 @@ bool wxSoundStreamWin::OpenDevice(int mode)
       return FALSE;
     }
 
-    m_current_frag_in   = WXSOUND_MAX_QUEUE-1;
-    m_input_frag_in = 0;
+    m_current_frag_in = WXSOUND_MAX_QUEUE-1;
+    m_input_frag_in   = 0;
 
     m_internal->m_input_enabled = TRUE;
   }
@@ -238,16 +240,14 @@ bool wxSoundStreamWin::OpenDevice(int mode)
 void wxSoundStreamWin::CloseDevice()
 {
   if (m_internal->m_output_enabled) {
-    m_internal->m_output_enabled = FALSE;
-    waveOutReset(m_internal->m_devout);
     FreeHeaders(wxSOUND_OUTPUT);
+    m_internal->m_output_enabled = FALSE;
     waveOutClose(m_internal->m_devout);
   }
 
   if (m_internal->m_input_enabled) {
-    m_internal->m_input_enabled  = FALSE;
-    waveInReset(m_internal->m_devin);
     FreeHeaders(wxSOUND_INPUT);
+    m_internal->m_input_enabled  = FALSE;
     waveInClose(m_internal->m_devin);
   }
 }
@@ -296,7 +296,6 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
   header->dwUser         = (DWORD)info;
   header->dwFlags        = WHDR_DONE;
 
-
   // "Prepare" the header
   if (mode == wxSOUND_INPUT) {
     MMRESULT result;
@@ -439,13 +438,17 @@ void wxSoundStreamWin::WaitFor(wxSoundInfoHeader *info)
       memset(info->m_data + info->m_position, 0, info->m_size);
       AddToQueue(info);
     }
+  }
 
+  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;
 }
 
 // -------------------------------------------------------------------------
@@ -623,14 +626,16 @@ void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 dev_handle, int flag)
     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_input_frag_in = (m_input_frag_in + 1) % WXSOUND_MAX_QUEUE;
     m_headers_rec[m_input_frag_in]->m_recording = FALSE;
-    OnSoundEvent(wxSOUND_INPUT);
+    m_input_frag_in = (m_input_frag_in + 1) % WXSOUND_MAX_QUEUE;
+    if (!m_waiting_for)
+      OnSoundEvent(wxSOUND_INPUT);
     m_queue_filled = FALSE;
   }
 }
@@ -657,7 +662,7 @@ 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;
@@ -674,9 +679,6 @@ bool wxSoundStreamWin::StartProduction(int evt)
 // -------------------------------------------------------------------------
 bool wxSoundStreamWin::StopProduction()
 {
-  if (m_internal->m_input_enabled)
-    waveInStop(m_internal->m_devin);
-
   m_production_started = FALSE;
   CloseDevice();
   return TRUE;

diff --git a/utils/wxMMedia2/lib/sndwin.h b/utils/wxMMedia2/lib/sndwin.h
index e6f979ed7d64d50061dfd72f22a44da7ea32d55d..7911f0e33a971adf17288e092ee2974cba66d797 100644 (file)
--- a/utils/wxMMedia2/lib/sndwin.h
+++ b/utils/wxMMedia2/lib/sndwin.h
@@ -33,13 +33,15 @@ class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
   // Internal but defined as public
   void NotifyDoneBuffer(wxUint32 dev_handle, int flag);
 
+  wxUint32 GetBestSize() const { return 4096; }
+
  protected:
   wxSoundInternal *m_internal;
   wxUint32 m_current_frag_in, m_current_frag_out;
   wxUint32 m_input_frag_in, m_output_frag_out;
   wxSoundInfoHeader **m_headers_play, **m_headers_rec;
 
-  bool m_production_started, m_queue_filled;
+  bool m_production_started, m_queue_filled, m_waiting_for;
 
  protected:
   void CreateSndWindow();