diff --git a/src/oplsynth/opl_mus_player.h b/src/oplsynth/opl_mus_player.h index 0379413d9..d20e0a960 100644 --- a/src/oplsynth/opl_mus_player.h +++ b/src/oplsynth/opl_mus_player.h @@ -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); diff --git a/src/sound/music_mus_midiout.cpp b/src/sound/music_mus_midiout.cpp index 144f0eb92..c8a214931 100644 --- a/src/sound/music_mus_midiout.cpp +++ b/src/sound/music_mus_midiout.cpp @@ -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)