[Scummvm-cvs-logs] SF.net SVN: scummvm:[39411] scummvm/trunk/engines/parallaction

[Kirben at users.sourceforge.net]

Revision: 39411
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39411&view=rev
Author:   Kirben
Date:     2009-03-15 06:23:16 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Ooops, actually set _mixer. 

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/sound.h
    scummvm/trunk/engines/parallaction/sound_br.cpp

Modified: scummvm/trunk/engines/parallaction/sound.h
===================================================================
--- scummvm/trunk/engines/parallaction/sound.h	2009-03-15 06:20:52 UTC (rev 39410)
+++ scummvm/trunk/engines/parallaction/sound.h	2009-03-15 06:23:16 UTC (rev 39411)
@@ -182,6 +182,7 @@
 
 class SoundMan_br : public SoundManImpl {
 protected:
+	Parallaction_br	*_vm;
 	Audio::Mixer	*_mixer;
 
 	Common::String _musicFile;
@@ -191,6 +192,8 @@
 	virtual void pause(bool p) = 0;
 
 public:
+	SoundMan_br(Parallaction_br *vm);
+
 	virtual void execute(int command, const char *parm);	
 	void setMusicFile(const char *parm);
 };

Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp	2009-03-15 06:20:52 UTC (rev 39410)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp	2009-03-15 06:23:16 UTC (rev 39411)
@@ -392,7 +392,7 @@
 	player->updateTimer();
 }
 
-DosSoundMan_br::DosSoundMan_br(Parallaction_br *vm, MidiDriver *driver) {
+DosSoundMan_br::DosSoundMan_br(Parallaction_br *vm, MidiDriver *driver) : SoundMan_br(vm) {
 	_midiPlayer = new MidiPlayer_MSC(driver);
 	assert(_midiPlayer);
 }
@@ -419,7 +419,7 @@
 	_midiPlayer->pause(p);
 }
 
-AmigaSoundMan_br::AmigaSoundMan_br(Parallaction_br *vm) {
+AmigaSoundMan_br::AmigaSoundMan_br(Parallaction_br *vm) : SoundMan_br(vm)  {
 	_musicStream = 0;
 }
 
@@ -457,6 +457,10 @@
 	_mixer->pauseHandle(_musicHandle, p);
 }
 
+SoundMan_br::SoundMan_br(Parallaction_br *vm) : _vm(vm) {
+	_mixer = _vm->_mixer;
+}
+
 void SoundMan_br::setMusicFile(const char *name) {
 	_musicFile = name;
 }


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