Moved fix to sndg72x.h

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

diff --git a/utils/wxMMedia2/lib/sndg72x.cpp b/utils/wxMMedia2/lib/sndg72x.cpp
index f1332d48e59fa1a133c1ac25474c13b8b9c5151c..11cd9d1d97476e18d26d95d1137fcc1a7e36d915 100644 (file)
--- a/utils/wxMMedia2/lib/sndg72x.cpp
+++ b/utils/wxMMedia2/lib/sndg72x.cpp
@@ -108,15 +108,12 @@ bool wxSoundFormatG72X::operator !=(const wxSoundFormatBase& frmt2) const
 // wxSoundStreamG72X
 // --------------------------------------------------------------------------
 
 // 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);
 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);
 }
 
   g72x_init_state(m_state);
 }
 

diff --git a/utils/wxMMedia2/lib/sndg72x.h b/utils/wxMMedia2/lib/sndg72x.h
index 8f56091a253bf0782ccaf3d5a6282c3a7b301039..165c9af4747fc1ca072a1c6f730a873e9c75482f 100644 (file)
--- a/utils/wxMMedia2/lib/sndg72x.h
+++ b/utils/wxMMedia2/lib/sndg72x.h
@@ -22,6 +22,9 @@ typedef enum {
   wxSOUND_G723_40
 } wxSoundG72XType;
 
   wxSOUND_G723_40
 } wxSoundG72XType;
 

+// This fixes a bug in Mingw95
+typedef struct g72x_state g72state;
+

 //
 // G72X format
 //
 //
 // 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;
   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);
 
   int (*m_coder)(int code, int in_code, struct g72x_state *state);
   int (*m_decoder)(int code, int out_code, struct g72x_state *state);