[Scummvm-cvs-logs] SF.net SVN: scummvm:[46420] scummvm/trunk/engines/sci/sfx/softseq

[thebluegr at users.sourceforge.net]

Revision: 46420
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46420&view=rev
Author:   thebluegr
Date:     2009-12-19 16:05:47 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
- Removed unused includes
- Added a new method for constructing a new MidiDriver in the Adlib driver
- Added a hack to obtain the resource manager in the default open() method of the overriden Adlib MIDI driver (used in the new sound code)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp
    scummvm/trunk/engines/sci/sfx/softseq/mididriver.h

Modified: scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp	2009-12-19 16:02:45 UTC (rev 46419)
+++ scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp	2009-12-19 16:05:47 UTC (rev 46420)
@@ -24,7 +24,6 @@
  */
 
 #include "sci/sci.h"
-#include "sci/sfx/iterator.h"
 
 #include "sound/fmopl.h"
 #include "sound/softsynth/emumidi.h"
@@ -812,4 +811,8 @@
 	return new MidiPlayer_Adlib();
 }
 
+MidiDriver *MidiDriver_Adlib_create() {
+	return new MidiDriver_Adlib(g_system->getMixer());
+}
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/sfx/softseq/mididriver.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/mididriver.h	2009-12-19 16:02:45 UTC (rev 46419)
+++ scummvm/trunk/engines/sci/sfx/softseq/mididriver.h	2009-12-19 16:05:47 UTC (rev 46420)
@@ -26,6 +26,7 @@
 #ifndef SCI_SFX_SOFTSEQ_MIDIDRIVER_H
 #define SCI_SFX_SOFTSEQ_MIDIDRIVER_H
 
+#include "sci/sci.h"
 #include "sound/mididrv.h"
 #include "sound/softsynth/emumidi.h"
 #include "common/error.h"
@@ -67,7 +68,10 @@
 protected:
 	MidiDriver *_driver;
 public:
-	int open() { return open(NULL); }
+	int open() {
+		ResourceManager *resMan = ((SciEngine *)g_engine)->getResourceManager();	// HACK
+		return open(resMan);
+	}
 	virtual int open(ResourceManager *resMan) { return _driver->open(); }
 	virtual void close() { _driver->close(); }
 	virtual void send(uint32 b) { _driver->send(b); }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.