[Scummvm-cvs-logs] SF.net SVN: scummvm:[36147] scummvm/trunk/engines/groovie

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Jan 30 16:41:23 CET 2009


Revision: 36147
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36147&view=rev
Author:   fingolfin
Date:     2009-01-30 15:41:23 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
Don't use g_engine to access the mixer

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/roq.cpp
    scummvm/trunk/engines/groovie/vdx.cpp

Modified: scummvm/trunk/engines/groovie/roq.cpp
===================================================================
--- scummvm/trunk/engines/groovie/roq.cpp	2009-01-30 14:26:34 UTC (rev 36146)
+++ scummvm/trunk/engines/groovie/roq.cpp	2009-01-30 15:41:23 UTC (rev 36147)
@@ -462,7 +462,7 @@
 #endif
 		_audioStream = Audio::makeAppendableAudioStream(22050, flags);
 		Audio::SoundHandle sound_handle;
-		::g_engine->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+		g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
 	}
 
 	// Create the audio buffer
@@ -505,7 +505,7 @@
 #endif
 		_audioStream = Audio::makeAppendableAudioStream(22050, flags);
 		Audio::SoundHandle sound_handle;
-		::g_engine->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+		g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
 	}
 
 	// Create the audio buffer

Modified: scummvm/trunk/engines/groovie/vdx.cpp
===================================================================
--- scummvm/trunk/engines/groovie/vdx.cpp	2009-01-30 14:26:34 UTC (rev 36146)
+++ scummvm/trunk/engines/groovie/vdx.cpp	2009-01-30 15:41:23 UTC (rev 36147)
@@ -488,7 +488,7 @@
 	if (!_audioStream) {
 		_audioStream = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE);
 		Audio::SoundHandle sound_handle;
-		::g_engine->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+		g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
 	}
 
 	byte *data = new byte[60000];


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




More information about the Scummvm-git-logs mailing list