zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added Jim's latest Linux patch

Browse source 
SVN r877 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-03 22:34:52 +00:00
parent d780c2e3a4
commit 935764e8c1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/oplsynth/opl_mus_player.h
View file

@ -13,7 +13,7 @@ class OPLmusicBlock : public musicBlock
{
public:
OPLmusicBlock();
~OPLmusicBlock();
virtual ~OPLmusicBlock();
bool ServiceStream(void *buff, int numbytes);
void ResetChips();
@ -43,7 +43,7 @@ class OPLmusicFile : public OPLmusicBlock
public:
OPLmusicFile(FILE *file, char *musiccache, int len);
OPLmusicFile(const OPLmusicFile *source, const char *filename);
~OPLmusicFile();
virtual ~OPLmusicFile();
bool IsValid() const;
void SetLooping(bool loop);

4
src/sound/music_mus_midiout.cpp
View file

@ -50,7 +50,9 @@
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
#ifdef _WIN32
extern UINT mididevice;
#endif
// PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -89,10 +91,12 @@ static const BYTE CtrlTranslate[15] =
MUSSong2::MUSSong2 (FILE *file, char *musiccache, int len, bool opl)
: MIDIStreamer(opl), MusHeader(0), MusBuffer(0)
{
#ifdef _WIN32
if (ExitEvent == NULL)
{
return;
}
#endif
MusHeader = (MUSHeader *)new BYTE[len];
if (file != NULL)