[Scummvm-cvs-logs] scummvm master -> 2dac5b76b0646a9e1e09790614fd39c5c5c8ed07

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2dac5b76b0 VOYEUR: Remove useless VoyeurEngine pointer in SoundManager


Commit: 2dac5b76b0646a9e1e09790614fd39c5c5c8ed07
    https://github.com/scummvm/scummvm/commit/2dac5b76b0646a9e1e09790614fd39c5c5c8ed07
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-09T19:33:28+01:00

Commit Message:
VOYEUR: Remove useless VoyeurEngine pointer in SoundManager

Changed paths:
    engines/voyeur/sound.cpp
    engines/voyeur/sound.h
    engines/voyeur/voyeur.cpp



diff --git a/engines/voyeur/sound.cpp b/engines/voyeur/sound.cpp
index ae10b2d..26145bd 100644
--- a/engines/voyeur/sound.cpp
+++ b/engines/voyeur/sound.cpp
@@ -28,7 +28,7 @@
 
 namespace Voyeur {
 
-	SoundManager::SoundManager(VoyeurEngine *vm, Audio::Mixer *mixer) : _vm(vm) {
+	SoundManager::SoundManager(Audio::Mixer *mixer) {
 	_mixer = mixer;
 	_vocOffset = 0;
 }
diff --git a/engines/voyeur/sound.h b/engines/voyeur/sound.h
index fc2d304..af1d0b1 100644
--- a/engines/voyeur/sound.h
+++ b/engines/voyeur/sound.h
@@ -33,12 +33,11 @@ namespace Voyeur {
 
 class SoundManager {
 private:
-	VoyeurEngine *_vm;
 	Audio::Mixer *_mixer;
 	Audio::SoundHandle _soundHandle;
 	int _vocOffset;
 public:
-	SoundManager(VoyeurEngine *vm, Audio::Mixer *mixer);
+	SoundManager(Audio::Mixer *mixer);
 
 	void playVOCMap(byte *voc, int vocSize);
 	void stopVOCPlay();
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 0406ba0..e32ceef 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -71,7 +71,7 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
 	_eventsManager = new EventsManager(this);
 	_filesManager = new FilesManager(this);
 	_graphicsManager = new GraphicsManager(this);
-	_soundManager = new SoundManager(this, _mixer);
+	_soundManager = new SoundManager(_mixer);
 	_voy = new SVoy(this);
 }