From 6c5e63761c870ea4918a3fe049f99fce6707b938 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 17 Aug 1999 17:51:33 +0000 Subject: [PATCH] Make wxMMedia2 compile on VC++ 5 Added makefile for VC++ 5 Warning: sndwin.cpp will not compile, it is unfinished git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxMMedia2/lib/cdbase.h | 6 +-- utils/wxMMedia2/lib/cdwin.cpp | 7 +-- utils/wxMMedia2/lib/cdwin.h | 6 +-- utils/wxMMedia2/lib/g711.cpp | 2 + utils/wxMMedia2/lib/g721.cpp | 2 + utils/wxMMedia2/lib/g723_24.cpp | 1 + utils/wxMMedia2/lib/g723_40.cpp | 1 + utils/wxMMedia2/lib/makefile.vc | 106 +++++++++++++++++++++++++++++++++++++++ utils/wxMMedia2/lib/sndaiff.cpp | 3 +- utils/wxMMedia2/lib/sndbase.cpp | 1 + utils/wxMMedia2/lib/sndcodec.cpp | 1 + utils/wxMMedia2/lib/sndcpcm.cpp | 1 + utils/wxMMedia2/lib/sndfile.cpp | 9 +++- utils/wxMMedia2/lib/sndpcm.cpp | 2 +- utils/wxMMedia2/lib/sndulaw.cpp | 1 + utils/wxMMedia2/lib/sndwav.cpp | 4 +- utils/wxMMedia2/lib/vidbase.cpp | 12 +++-- 17 files changed, 140 insertions(+), 25 deletions(-) create mode 100644 utils/wxMMedia2/lib/makefile.vc diff --git a/utils/wxMMedia2/lib/cdbase.h b/utils/wxMMedia2/lib/cdbase.h index 8069d0a..a46821b 100644 --- a/utils/wxMMedia2/lib/cdbase.h +++ b/utils/wxMMedia2/lib/cdbase.h @@ -15,11 +15,7 @@ #pragma interface #endif -#ifdef WX_PRECOMP -#include "wx_prec.h" -#else -#include "wx/wx.h" -#endif +#include "wx/wxprec.h" typedef struct wxCDtime { wxUint8 track; diff --git a/utils/wxMMedia2/lib/cdwin.cpp b/utils/wxMMedia2/lib/cdwin.cpp index 1243911..8ac8c3a 100644 --- a/utils/wxMMedia2/lib/cdwin.cpp +++ b/utils/wxMMedia2/lib/cdwin.cpp @@ -14,11 +14,7 @@ #include #include #include -#ifdef WX_PRECOMP #include "wx/wxprec.h" -#else -#include "wx/wx.h" -#endif #define WXMMEDIA_INTERNAL #include "cdbase.h" #include "cdwin.h" @@ -69,7 +65,6 @@ wxCDAudioWin::~wxCDAudioWin(void) void wxCDAudioWin::PrepareToc(void) { MCI_STATUS_PARMS status_struct; - MCI_SET_PARMS set_struct; wxUint16 i, nb_m_trksize; wxCDtime total_time, *trk; DWORD ret, tmem; @@ -201,7 +196,7 @@ wxCDtime wxCDAudioWin::GetTime(void) return cd_time; } -wxCDAudio::CDtoc& wxCDAudioWin::GetToc(void) +const wxCDAudio::CDtoc& wxCDAudioWin::GetToc(void) { return *m_toc; } diff --git a/utils/wxMMedia2/lib/cdwin.h b/utils/wxMMedia2/lib/cdwin.h index f367aeb..0c8fa5f 100644 --- a/utils/wxMMedia2/lib/cdwin.h +++ b/utils/wxMMedia2/lib/cdwin.h @@ -14,11 +14,7 @@ #pragma interface #endif -#ifdef WX_PRECOMP #include "wx/wxprec.h" -#else -#include "wx/wx.h" -#endif #include "cdbase.h" #ifdef WXMMEDIA_INTERNAL @@ -56,7 +52,7 @@ public: /// virtual wxCDtime GetTime(void); /// - virtual CDtoc& GetToc(void); + virtual const CDtoc& GetToc(void); /// virtual inline bool Ok(void) const { return m_ok; } protected: diff --git a/utils/wxMMedia2/lib/g711.cpp b/utils/wxMMedia2/lib/g711.cpp index d4d60a5..99fb3ca 100644 --- a/utils/wxMMedia2/lib/g711.cpp +++ b/utils/wxMMedia2/lib/g711.cpp @@ -24,6 +24,8 @@ * Mountain View, California 94043 */ +#include + /* * g711.c * diff --git a/utils/wxMMedia2/lib/g721.cpp b/utils/wxMMedia2/lib/g721.cpp index 3411d1a..309d039 100644 --- a/utils/wxMMedia2/lib/g721.cpp +++ b/utils/wxMMedia2/lib/g721.cpp @@ -24,6 +24,8 @@ * Mountain View, California 94043 */ +#include + /* * g721.c * diff --git a/utils/wxMMedia2/lib/g723_24.cpp b/utils/wxMMedia2/lib/g723_24.cpp index ba122ea..3193ad4 100644 --- a/utils/wxMMedia2/lib/g723_24.cpp +++ b/utils/wxMMedia2/lib/g723_24.cpp @@ -37,6 +37,7 @@ * of workstation attributes, such as hardware 2's complement arithmetic. * */ +#include #include "g72x.h" /* diff --git a/utils/wxMMedia2/lib/g723_40.cpp b/utils/wxMMedia2/lib/g723_40.cpp index b8ec06a..141fe7b 100644 --- a/utils/wxMMedia2/lib/g723_40.cpp +++ b/utils/wxMMedia2/lib/g723_40.cpp @@ -45,6 +45,7 @@ * the name of the module which it is implementing. * */ +#include #include "g72x.h" /* diff --git a/utils/wxMMedia2/lib/makefile.vc b/utils/wxMMedia2/lib/makefile.vc new file mode 100644 index 0000000..12736d6 --- /dev/null +++ b/utils/wxMMedia2/lib/makefile.vc @@ -0,0 +1,106 @@ +# +# File: makefile.nt +# Author: Julian Smart +# Created: 1993 +# Updated: +# Copyright: (c) 1993, AIAI, University of Edinburgh +# +# "%W% %G%" +# +# Makefile : Builds GLCanvas class library (MS VC++). +# Use FINAL=1 argument to nmake to build final version with no debugging +# info + +# Set WXDIR for your system +WXDIR = $(WXWIN) +MMDIR = $(WXDIR)\utils\wxMMedia2 +THISDIR = $(MMDIR)\lib +EXTRALIBS=$(WXDIR)\lib\glcanvas.lib + +LIBTARGET=$(WXDIR)\lib\mmedia2.lib +OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj \ + g723_40.obj g72x.obj sndbase.obj sndcodec.obj sndpcm.obj \ + sndcpcm.obj sndulaw.obj sndfile.obj sndwav.obj sndaiff.obj sndwin.obj \ + vidbase.obj + +!include $(WXDIR)\src\makelib.vc + +cdbase.obj: cdbase.h cdbase.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +cdwin.obj: cdwin.h cdwin.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +g711.obj: g72x.h g711.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +g721.obj: g72x.h g721.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +g723_24.obj: g72x.h g723_24.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +g723_40.obj: g72x.h g723_40.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndbase.obj: sndbase.h sndbase.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndcodec.obj: sndcodec.h sndcodec.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndpcm.obj: sndpcm.h sndpcm.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndcpcm.obj: sndcpcm.h converter.def sndcpcm.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndulaw.obj: sndulaw.h g72x.h sndulaw.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndfile.obj: sndfile.h sndfile.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndwav.obj: sndwav.h sndwav.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndaiff.obj: sndaiff.h sndaiff.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +sndwin.obj: sndwin.h sndwin.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< + +vidbase.obj: vidbase.h vidbase.$(SRCSUFF) + $(cc) @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) +<< diff --git a/utils/wxMMedia2/lib/sndaiff.cpp b/utils/wxMMedia2/lib/sndaiff.cpp index 8c53872..a65f875 100644 --- a/utils/wxMMedia2/lib/sndaiff.cpp +++ b/utils/wxMMedia2/lib/sndaiff.cpp @@ -9,7 +9,8 @@ #pragma implementation "sndaiff.cpp" #endif -#include +#include + #include #include #include diff --git a/utils/wxMMedia2/lib/sndbase.cpp b/utils/wxMMedia2/lib/sndbase.cpp index 2cfc5c0..d5e6e8f 100644 --- a/utils/wxMMedia2/lib/sndbase.cpp +++ b/utils/wxMMedia2/lib/sndbase.cpp @@ -9,6 +9,7 @@ #pragma implementation "sndbase.cpp" #endif +#include #include "sndbase.h" diff --git a/utils/wxMMedia2/lib/sndcodec.cpp b/utils/wxMMedia2/lib/sndcodec.cpp index 270a2c1..a21281b 100644 --- a/utils/wxMMedia2/lib/sndcodec.cpp +++ b/utils/wxMMedia2/lib/sndcodec.cpp @@ -9,6 +9,7 @@ #pragma implementation "sndcodec.cpp" #endif +#include #include "sndbase.h" #include "sndcodec.h" diff --git a/utils/wxMMedia2/lib/sndcpcm.cpp b/utils/wxMMedia2/lib/sndcpcm.cpp index 5b3fc9b..8f54607 100644 --- a/utils/wxMMedia2/lib/sndcpcm.cpp +++ b/utils/wxMMedia2/lib/sndcpcm.cpp @@ -9,6 +9,7 @@ #pragma implementation "sndcpcm.cpp" #endif +#include #include "sndbase.h" #include "sndpcm.h" #include "sndcpcm.h" diff --git a/utils/wxMMedia2/lib/sndfile.cpp b/utils/wxMMedia2/lib/sndfile.cpp index 3040943..6525d2b 100644 --- a/utils/wxMMedia2/lib/sndfile.cpp +++ b/utils/wxMMedia2/lib/sndfile.cpp @@ -5,7 +5,12 @@ // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ // -------------------------------------------------------------------------- +#include + +#ifndef WX_PRECOMP #include +#endif + #include "sndbase.h" #include "sndcodec.h" #include "sndfile.h" @@ -258,8 +263,9 @@ bool wxSoundFileStream::StopProduction() void wxSoundFileStream::OnSoundEvent(int evt) { size_t len = m_sndio->GetBestSize(); - char buffer[m_sndio->GetBestSize()]; + char *buffer; + buffer = new char[m_sndio->GetBestSize()]; wxSoundStream::OnSoundEvent(evt); switch(evt) { @@ -284,6 +290,7 @@ void wxSoundFileStream::OnSoundEvent(int evt) m_codec.Write(buffer, len); break; } + delete[] buffer; } bool wxSoundFileStream::SetSoundFormat(const wxSoundFormatBase& format) diff --git a/utils/wxMMedia2/lib/sndpcm.cpp b/utils/wxMMedia2/lib/sndpcm.cpp index 50a2436..8e3225c 100644 --- a/utils/wxMMedia2/lib/sndpcm.cpp +++ b/utils/wxMMedia2/lib/sndpcm.cpp @@ -9,10 +9,10 @@ #pragma implementation "sndpcm.cpp" #endif +#include #include "sndbase.h" #include "sndpcm.h" - wxSoundFormatPcm::wxSoundFormatPcm(wxUint32 srate, wxUint8 bps, wxUint16 nchannels, bool sign, int order) diff --git a/utils/wxMMedia2/lib/sndulaw.cpp b/utils/wxMMedia2/lib/sndulaw.cpp index bba1cd7..3142d17 100644 --- a/utils/wxMMedia2/lib/sndulaw.cpp +++ b/utils/wxMMedia2/lib/sndulaw.cpp @@ -9,6 +9,7 @@ #pragma implementation "sndulaw.cpp" #endif +#include #include "sndbase.h" #include "sndfile.h" #include "sndpcm.h" diff --git a/utils/wxMMedia2/lib/sndwav.cpp b/utils/wxMMedia2/lib/sndwav.cpp index 9cd9fb2..f0d3f66 100644 --- a/utils/wxMMedia2/lib/sndwav.cpp +++ b/utils/wxMMedia2/lib/sndwav.cpp @@ -9,10 +9,12 @@ #pragma implementation "sndwav.cpp" #endif -#include +#include + #include #include #include + #include "sndbase.h" #include "sndcodec.h" #include "sndfile.h" diff --git a/utils/wxMMedia2/lib/vidbase.cpp b/utils/wxMMedia2/lib/vidbase.cpp index 98084b5..629389b 100644 --- a/utils/wxMMedia2/lib/vidbase.cpp +++ b/utils/wxMMedia2/lib/vidbase.cpp @@ -10,14 +10,16 @@ #ifdef __GNUG__ #pragma implementation "vidbase.h" #endif + +#include + +#ifndef WX_PRECOMP +#include #include -#include "vidbase.h" -#ifdef WX_PRECOMP -#include "wx_prec.h" -#else -#include "wx/wx.h" #endif +#include "vidbase.h" + #ifdef __BORLANDC__ #pragma hdrstop #endif -- 2.7.4