Moved fix to sndg72x.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d6f941fdda
commit
2de89127de
@ -108,15 +108,12 @@ bool wxSoundFormatG72X::operator !=(const wxSoundFormatBase& frmt2) const
|
||||
// wxSoundStreamG72X
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
// This fixes a bug in Mingw95
|
||||
typedef struct g72x_state g7s;
|
||||
|
||||
wxSoundStreamG72X::wxSoundStreamG72X(wxSoundStream& sndio)
|
||||
: wxSoundStreamCodec(sndio)
|
||||
{
|
||||
// PCM converter
|
||||
m_router = new wxSoundRouterStream(sndio);
|
||||
m_state = new g7s;
|
||||
m_state = new g72state;
|
||||
g72x_init_state(m_state);
|
||||
}
|
||||
|
||||
|
@ -22,6 +22,9 @@ typedef enum {
|
||||
wxSOUND_G723_40
|
||||
} wxSoundG72XType;
|
||||
|
||||
// This fixes a bug in Mingw95
|
||||
typedef struct g72x_state g72state;
|
||||
|
||||
//
|
||||
// G72X format
|
||||
//
|
||||
@ -68,7 +71,7 @@ class WXDLLEXPORT wxSoundStreamG72X: public wxSoundStreamCodec {
|
||||
wxSoundRouterStream *m_router;
|
||||
wxUint8 m_n_bits, m_current_mask, m_current_b_pos, m_current_byte;
|
||||
wxUint8 *m_io_buffer;
|
||||
struct g72x_state *m_state;
|
||||
g72state *m_state;
|
||||
|
||||
int (*m_coder)(int code, int in_code, struct g72x_state *state);
|
||||
int (*m_decoder)(int code, int out_code, struct g72x_state *state);
|
||||
|
Loading…
Reference in New Issue
Block a user