Fixed compilation/link errors

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

diff --git a/utils/wxMMedia2/lib/sndaiff.cpp b/utils/wxMMedia2/lib/sndaiff.cpp
index 70a6a6a21c11f23fc220809d7f541fd71bae22b2..bfcb149f8c231dba28d3f7f95c1ab022f3a2cc4b 100644 (file)
--- a/utils/wxMMedia2/lib/sndaiff.cpp
+++ b/utils/wxMMedia2/lib/sndaiff.cpp
@@ -90,7 +90,7 @@ bool wxSoundAiff::PrepareToPlay()
       sndformat.SetSampleRate((wxUint32) srate);
       sndformat.SetBPS(bps);
       sndformat.SetChannels(channels);
-      sndformat.Signed(TRUE);
+      sndformat.Signed(FALSE);
       sndformat.SetOrder(wxBIG_ENDIAN);
 
       if (!SetSoundFormat(sndformat))

diff --git a/utils/wxMMedia2/lib/sndcpcm.cpp b/utils/wxMMedia2/lib/sndcpcm.cpp
index e18908b2317b3ebf52b06738cd71adeb845d98b4..a6f0a18d07820e745766d746507d68936f805629 100644 (file)
--- a/utils/wxMMedia2/lib/sndcpcm.cpp
+++ b/utils/wxMMedia2/lib/sndcpcm.cpp
@@ -159,7 +159,7 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
   pcm_format2 = (wxSoundFormatPcm *)new_format;
 
   m_16_to_8 = FALSE;
-  if (pcm_format->GetBPS() == 16 && pcm_format2->GetBPS() == 8) {
+  if (pcm_format->GetBPS() != pcm_format2->GetBPS()) {
     m_16_to_8 = TRUE;
     current_table_out = s_convert_out_16_to_8;
     current_table_in  = s_convert_in_8_to_16;

diff --git a/utils/wxMMedia2/lib/sndg72x.cpp b/utils/wxMMedia2/lib/sndg72x.cpp
index a14fbd12e69214829bda932c46e6a9f772d8a706..798c0bc66573ff725321489bd50f02e7c9c54ec3 100644 (file)
--- a/utils/wxMMedia2/lib/sndg72x.cpp
+++ b/utils/wxMMedia2/lib/sndg72x.cpp
@@ -1,19 +1,18 @@
 // --------------------------------------------------------------------------
-// Name: sndulaw.cpp
+// Name: sndg72x.cpp
 // Purpose:
-// Date: 08/11/1999
+// Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
-#pragma implementation "sndulaw.cpp"
+#pragma implementation "sndg72x.cpp"
 #endif
 
 #include <wx/wxprec.h>
 #include "sndbase.h"
 #include "sndfile.h"
 #include "sndpcm.h"
-#include "sndulaw.h"
 #include "sndg72x.h"
 #include "g72x.h"
 

diff --git a/utils/wxMMedia2/lib/sndg72x.h b/utils/wxMMedia2/lib/sndg72x.h
index 53d6b8bd5c22b9bc523a2235f7e0d66795761a7d..8f56091a253bf0782ccaf3d5a6282c3a7b301039 100644 (file)
--- a/utils/wxMMedia2/lib/sndg72x.h
+++ b/utils/wxMMedia2/lib/sndg72x.h
@@ -1,7 +1,7 @@
 // --------------------------------------------------------------------------
-// Name: sndg.h
+// Name: sndg72x.h
 // Purpose:
-// Date: 08/11/1999
+// Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
 // --------------------------------------------------------------------------

diff --git a/utils/wxMMedia2/sample/test_med2.cpp b/utils/wxMMedia2/sample/test_med2.cpp
index 22d240a36fb939fe0e6b894c7b41a390ec934bf1..a6bc06ddaa755dee198a436f43d4ad4e3c744ad3 100644 (file)
--- a/utils/wxMMedia2/sample/test_med2.cpp
+++ b/utils/wxMMedia2/sample/test_med2.cpp
@@ -16,7 +16,7 @@ class MyApp: public wxApp {
  bool OnInit() {
    wxSoundStreamOSS *oss_dev = new wxSoundStreamOSS();
    wxFileInputStream *f_input = new wxFileInputStream(argv[1]);
-   wxSoundWave *wav_file = new wxSoundWave(*f_input, *oss_dev);
+   wxSoundFileStream *wav_file = new wxSoundAiff(*f_input, *oss_dev);
    wxFrame *frame = new wxFrame(NULL, -1, "My Frame");
    wxSoundFormatPcm pcm;