wxPalette unified. Source cleaning.

[wxWidgets.git] / contrib / include / wx / mmedia / sndwav.h

diff --git a/contrib/include/wx/mmedia/sndwav.h b/contrib/include/wx/mmedia/sndwav.h
index 766689e1021615d7832eba0d42dc4db49b97f286..951a0a06973d292eb6d0331e94701cd99eda52ae 100644 (file)
--- a/contrib/include/wx/mmedia/sndwav.h
+++ b/contrib/include/wx/mmedia/sndwav.h
@@ -4,18 +4,16 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// License:    wxWindows license
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDWAV_H
 #define _WX_SNDWAV_H
 
-#ifdef __GNUG__
-#pragma interface "sndwav.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "wx/datstrm.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndfile.h"
@@ -24,7 +22,7 @@
 // WAVE codec
 //
 
-class wxSoundWave: public wxSoundFileStream {
+class WXDLLIMPEXP_MMEDIA wxSoundWave: public wxSoundFileStream {
 public:
     wxSoundWave(wxInputStream& stream, wxSoundStream& io_sound);
     wxSoundWave(wxOutputStream& stream, wxSoundStream& io_sound);
@@ -42,12 +40,18 @@ protected:
     wxUint32 GetData(void *buffer, wxUint32 len);
     wxUint32 PutData(const void *buffer, wxUint32 len);
     
-    bool HandleOutputPCM(wxDataInputStream& data, wxUint16 channels,
-                         wxUint32 sample_fq, wxUint32 byte_p_sec,
-                         wxUint16 byte_p_spl, wxUint16 bits_p_spl);
-    bool HandleOutputG721(wxDataInputStream& data, wxUint16 channels,
-                          wxUint32 sample_fq, wxUint32 byte_p_sec,
-                          wxUint16 byte_p_spl, wxUint16 bits_p_spl);
+    bool HandleOutputPCM(wxDataInputStream& data, wxUint32 len,
+                         wxUint16 channels, wxUint32 sample_fq,
+                         wxUint32 byte_p_sec, wxUint16 byte_p_spl,
+                         wxUint16 bits_p_spl);
+    bool HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
+                             wxUint16 channels, wxUint32 sample_fq,
+                             wxUint32 byte_p_sec, wxUint16 byte_p_spl,
+                             wxUint16 bits_p_spl);
+    bool HandleOutputG721(wxDataInputStream& data, wxUint32 len,
+                          wxUint16 channels, wxUint32 sample_fq,
+                          wxUint32 byte_p_sec, wxUint16 byte_p_spl,
+                          wxUint16 bits_p_spl);
     wxSoundFormatBase *HandleInputPCM(wxDataOutputStream& data);
     wxSoundFormatBase *HandleInputG72X(wxDataOutputStream& data);