- Added Jim's latest Linux patch

SVN r877 (trunk)

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);

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)