Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation/link errors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-08-28 12:28:22 +00:00
parent 0662cd3286
commit aa95f52ee7
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/wxMMedia2/lib/sndaiff.cpp
View File

@@ -90,7 +90,7 @@ bool wxSoundAiff::PrepareToPlay()
sndformat.SetSampleRate((wxUint32) srate); sndformat.SetSampleRate((wxUint32) srate);
sndformat.SetBPS(bps); sndformat.SetBPS(bps);
sndformat.SetChannels(channels); sndformat.SetChannels(channels);
sndformat.Signed(TRUE); sndformat.Signed(FALSE);
sndformat.SetOrder(wxBIG_ENDIAN); sndformat.SetOrder(wxBIG_ENDIAN);
if (!SetSoundFormat(sndformat)) if (!SetSoundFormat(sndformat))

2
utils/wxMMedia2/lib/sndcpcm.cpp
View File

@@ -159,7 +159,7 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
pcm_format2 = (wxSoundFormatPcm *)new_format; pcm_format2 = (wxSoundFormatPcm *)new_format;
m_16_to_8 = FALSE; 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; m_16_to_8 = TRUE;
current_table_out = s_convert_out_16_to_8; current_table_out = s_convert_out_16_to_8;
current_table_in = s_convert_in_8_to_16; current_table_in = s_convert_in_8_to_16;

7
utils/wxMMedia2/lib/sndg72x.cpp
View File

@@ -1,19 +1,18 @@
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Name: sndulaw.cpp // Name: sndg72x.cpp
// Purpose: // Purpose:
// Date: 08/11/1999 // Date: 08/26/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "sndulaw.cpp" #pragma implementation "sndg72x.cpp"
#endif #endif
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "sndbase.h" #include "sndbase.h"
#include "sndfile.h" #include "sndfile.h"
#include "sndpcm.h" #include "sndpcm.h"
#include "sndulaw.h"
#include "sndg72x.h" #include "sndg72x.h"
#include "g72x.h" #include "g72x.h"

4
utils/wxMMedia2/lib/sndg72x.h
View File

@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Name: sndg.h // Name: sndg72x.h
// Purpose: // Purpose:
// Date: 08/11/1999 // Date: 08/26/1999
// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
// CVSID: $Id$ // CVSID: $Id$
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

2
utils/wxMMedia2/sample/test_med2.cpp
View File

@@ -16,7 +16,7 @@ class MyApp: public wxApp {
bool OnInit() { bool OnInit() {
wxSoundStreamOSS *oss_dev = new wxSoundStreamOSS(); wxSoundStreamOSS *oss_dev = new wxSoundStreamOSS();
wxFileInputStream *f_input = new wxFileInputStream(argv[1]); 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"); wxFrame *frame = new wxFrame(NULL, -1, "My Frame");
wxSoundFormatPcm pcm; wxSoundFormatPcm pcm;