Corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
typedef struct _wxSoundInternal wxSoundInternal;
|
||||
typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
|
||||
|
||||
class wxSoundInternal;
|
||||
// class WXDLLEXPORT wxSoundInternal;
|
||||
class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
|
||||
public:
|
||||
wxSoundStreamWin();
|
||||
|
@@ -10,10 +10,10 @@
|
||||
#endif
|
||||
|
||||
#include <wx/wxprec.h>
|
||||
#include "sndbase.h"
|
||||
#include "sndfile.h"
|
||||
#include "sndpcm.h"
|
||||
#include "sndmsad.h"
|
||||
#include "wx/mmedia/sndbase.h"
|
||||
#include "wx/mmedia/sndfile.h"
|
||||
#include "wx/mmedia/sndpcm.h"
|
||||
#include "wx/mmedia/sndmsad.h"
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// wxSoundFormatMSAdpcm
|
||||
|
@@ -16,11 +16,12 @@
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/defs.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/module.h"
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/string.h"
|
||||
#endif
|
||||
|
||||
#include "wx/module.h"
|
||||
#include "wx/msw/private.h"
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// MMedia headers
|
||||
// -------------------------------------------------------------------------
|
||||
@@ -117,7 +118,13 @@ wxSoundStreamWin::~wxSoundStreamWin()
|
||||
// -----------------------------------------------------------------------
|
||||
// _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)
|
||||
{
|
||||
wxSoundStreamWin *sndwin;
|
||||
@@ -307,7 +314,7 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
|
||||
info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR));
|
||||
if (!info->m_h_data || !info->m_h_header) {
|
||||
delete info;
|
||||
m_snderror = wxSOUND_MEMERR;
|
||||
m_snderror = wxSOUND_MEMERROR;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user