From 2ccbbae6ee38a6fee95dcd35790bd5f98d44907a Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Mon, 8 Sep 2008 09:57:37 +0000
Subject: [PATCH] re-enabled WinMM MIDI

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1587 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog          | 11 ++++++++++-
 src/core/mixer.cpp |  3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c763a98f..bf966461c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-08	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/mixer.cpp:
+	re-enabled WinMM MIDI
+
+	* include/midi_winmm.h:
+	* src/core/midi/midi_winmm.cpp:
+	create separate thread for WinMM MIDI
+
 2008-09-08	Paul Giblock <drfaygo/at/gmail/dot/com>
 
 	* plugins/sid/logo.png:
@@ -36,7 +45,7 @@
 	* plugins/papu/papu_instrument.cpp:
 	* plugins/CMakeLists.txt:
 	- Add Csaba and Attila's GameBoy emulator so it can be tested in RC1
-	- Update artwork to something not trademarked.  "Freeboy" is just for now.
+	- Update artwork to something not trademarked. "Freeboy" is just for now
 
 2008-09-07	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp
index 6c2222b57..0d15e19c1 100644
--- a/src/core/mixer.cpp
+++ b/src/core/mixer.cpp
@@ -1120,7 +1120,6 @@ midiClient * mixer::tryMidiClients( void )
 	}
 #endif
 
-#if 0
 #ifdef LMMS_BUILD_WIN32
 	if( client_name == midiWinMM::name() || client_name == "" )
 	{
@@ -1133,7 +1132,7 @@ midiClient * mixer::tryMidiClients( void )
 		delete mwmm;
 	}
 #endif
-#endif
+
 	printf( "Couldn't create MIDI-client, neither with ALSA nor with "
 		"OSS. Will use dummy-MIDI-client.\n" );