Copy some missing samples, and contrib for Motif/Mac

[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..88b9e06c6ab315f6b50f9b7efa39d638f4164ca2 100644 (file)
--- a/contrib/include/wx/mmedia/sndwav.h
+++ b/contrib/include/wx/mmedia/sndwav.h
@@ -16,6 +16,7 @@
 #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"
@@ -42,12 +43,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);