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

Corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-06 17:34:25 +00:00
parent 425652451b
commit 59917a749b
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/include/wx/mmedia/sndwin.h
View File

@@ -14,7 +14,7 @@
typedef struct _wxSoundInternal wxSoundInternal; typedef struct _wxSoundInternal wxSoundInternal;
typedef struct _wxSoundInfoHeader wxSoundInfoHeader; typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
class wxSoundInternal; // class WXDLLEXPORT wxSoundInternal;
class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream { class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
public: public:
wxSoundStreamWin(); wxSoundStreamWin();

8
contrib/src/mmedia/sndmsad.cpp
View File

@@ -10,10 +10,10 @@
#endif #endif
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "sndbase.h" #include "wx/mmedia/sndbase.h"
#include "sndfile.h" #include "wx/mmedia/sndfile.h"
#include "sndpcm.h" #include "wx/mmedia/sndpcm.h"
#include "sndmsad.h" #include "wx/mmedia/sndmsad.h"
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// wxSoundFormatMSAdpcm // wxSoundFormatMSAdpcm

15
contrib/src/mmedia/sndwin.cpp
View File

@@ -16,11 +16,12 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/module.h"
#include "wx/msw/private.h"
#include "wx/string.h" #include "wx/string.h"
#endif #endif
#include "wx/module.h"
#include "wx/msw/private.h"
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// MMedia headers // MMedia headers
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@@ -117,7 +118,13 @@ wxSoundStreamWin::~wxSoundStreamWin()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// _wxSoundHandlerWndProc: Window callback to handle buffer completion // _wxSoundHandlerWndProc: Window callback to handle buffer completion
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
LRESULT APIENTRY _EXPORT _wxSoundHandlerWndProc(HWND hWnd, UINT message, /*
LRESULT APIENTRY _EXPORT
*/
LRESULT WXDLLEXPORT APIENTRY _EXPORT
_wxSoundHandlerWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam) WPARAM wParam, LPARAM lParam)
{ {
wxSoundStreamWin *sndwin; wxSoundStreamWin *sndwin;
@@ -307,7 +314,7 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR)); info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR));
if (!info->m_h_data || !info->m_h_header) { if (!info->m_h_data || !info->m_h_header) {
delete info; delete info;
m_snderror = wxSOUND_MEMERR; m_snderror = wxSOUND_MEMERROR;
return NULL; return NULL;
} }