Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in wxSound windows driver (Recording is in progress: don't try it

Browse Source 
it make Windows crash completely)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-11-14 17:20:11 +00:00
parent 454e2a22c0
commit cc82835c2b
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/wxMMedia2/lib/makefile.vc
View File

@@ -18,7 +18,7 @@ THISDIR = $(MMDIR)\lib
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
LIBTARGET=$(WXDIR)\lib\mmedia2.lib LIBTARGET=$(WXDIR)\lib\mmedia2.lib
OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj \ OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj sndg72x.obj \
g723_40.obj g72x.obj sndbase.obj sndcodec.obj sndpcm.obj \ g723_40.obj g72x.obj sndbase.obj sndcodec.obj sndpcm.obj \
sndcpcm.obj sndulaw.obj sndfile.obj sndwav.obj sndaiff.obj sndwin.obj \ sndcpcm.obj sndulaw.obj sndfile.obj sndwav.obj sndaiff.obj sndwin.obj \
vidbase.obj vidbase.obj

22
utils/wxMMedia2/lib/sndwin.cpp
View File

@@ -65,6 +65,9 @@ wxSoundStreamWin::wxSoundStreamWin()
CreateSndWindow(); CreateSndWindow();
SetSoundFormat(pcm); SetSoundFormat(pcm);
m_internal->m_input_enabled = FALSE;
m_internal->m_output_enabled = FALSE;
if (!OpenDevice(wxSOUND_OUTPUT)) if (!OpenDevice(wxSOUND_OUTPUT))
return; return;
@@ -83,12 +86,18 @@ wxSoundStreamWin::~wxSoundStreamWin()
LRESULT APIENTRY _EXPORT _wxSoundHandlerWndProc(HWND hWnd, UINT message, LRESULT APIENTRY _EXPORT _wxSoundHandlerWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam) WPARAM wParam, LPARAM lParam)
{ {
wxSoundStreamWin *sndwin;
sndwin = wxFindSoundFromHandle((WXHWND)hWnd);
if (!sndwin)
return (LRESULT)0;
switch (message) { switch (message) {
case MM_WOM_DONE: case MM_WOM_DONE:
wxFindSoundFromHandle((WXHWND)hWnd)->NotifyDoneBuffer(wParam, wxSOUND_OUTPUT); sndwin->NotifyDoneBuffer(wParam, wxSOUND_OUTPUT);
break; break;
case MM_WIM_DATA: case MM_WIM_DATA:
wxFindSoundFromHandle((WXHWND)hWnd)->NotifyDoneBuffer(wParam, wxSOUND_INPUT); sndwin->NotifyDoneBuffer(wParam, wxSOUND_INPUT);
break; break;
default: default:
break; break;
@@ -228,16 +237,15 @@ bool wxSoundStreamWin::OpenDevice(int mode)
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void wxSoundStreamWin::CloseDevice() void wxSoundStreamWin::CloseDevice()
{ {
m_internal->m_output_enabled = FALSE;
m_internal->m_input_enabled = FALSE;
if (m_internal->m_output_enabled) { if (m_internal->m_output_enabled) {
m_internal->m_output_enabled = FALSE;
waveOutReset(m_internal->m_devout); waveOutReset(m_internal->m_devout);
FreeHeaders(wxSOUND_OUTPUT); FreeHeaders(wxSOUND_OUTPUT);
waveOutClose(m_internal->m_devout); waveOutClose(m_internal->m_devout);
} }
if (m_internal->m_input_enabled) { if (m_internal->m_input_enabled) {
m_internal->m_input_enabled = FALSE;
waveInReset(m_internal->m_devin); waveInReset(m_internal->m_devin);
FreeHeaders(wxSOUND_INPUT); FreeHeaders(wxSOUND_INPUT);
waveInClose(m_internal->m_devin); waveInClose(m_internal->m_devin);
@@ -549,12 +557,12 @@ wxSoundInfoHeader *wxSoundStreamWin::NextFragmentInput()
{ {
wxSoundInfoHeader *header; wxSoundInfoHeader *header;
m_current_frag_in = (m_current_frag_in + 1) % WXSOUND_MAX_QUEUE;
header = m_headers_rec[m_current_frag_in]; header = m_headers_rec[m_current_frag_in];
if (header->m_recording) if (header->m_recording)
WaitFor(header); WaitFor(header);
m_current_frag_in = (m_current_frag_in + 1) % WXSOUND_MAX_QUEUE;
if (m_current_frag_in == m_input_frag_in) if (m_current_frag_in == m_input_frag_in)
m_queue_filled = TRUE; m_queue_filled = TRUE;