We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now

svn-id: r10883

1 files changed, 6 insertions, 9 deletions

diff --git a/base/gameDetector.h b/base/gameDetector.h
index d105e1d20a..f82237eaf9 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -71,20 +71,17 @@ public:
 	
 	bool _dumpScripts;
 
-	int _midi_driver;
-
 public:
-	OSystem *createSystem();
-	Engine *createEngine(OSystem *system);
+	void setTarget(const String &name);
 
-	SoundMixer *createMixer();
-	MidiDriver *createMidi();
-	int getMidiDriverType();	// FIXME: Try to get rid of this, only Sky frontend uses it
+	Engine *createEngine(OSystem *system);
 
-	void setTarget(const String &name);
+	static OSystem *createSystem();
+	static SoundMixer *createMixer();
+	static MidiDriver *createMidi(int midiDriver);
 
 	static int parseGraphicsMode(const String &s);	// Used in main()
-	static int parseMusicDriver(const String &s);
+	static int detectMusicDriver(int midiFlags);
 	
 	static GameSettings findGame(const String &gameName, const Plugin **plugin = NULL);