[Scummvm-cvs-logs] SF.net SVN: scummvm:[39868] scummvm/trunk/engines/cruise

[eriktorbjorn at users.sourceforge.net]

Revision: 39868
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39868&view=rev
Author:   eriktorbjorn
Date:     2009-04-05 15:58:27 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
Apart from a "const", the volume() and getVolume() function were identical.
Removed the volume() function.

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/function.cpp
    scummvm/trunk/engines/cruise/sound.h

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-04-05 15:50:16 UTC (rev 39867)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-04-05 15:58:27 UTC (rev 39868)
@@ -1635,7 +1635,7 @@
 }
 
 int16 Op_SetVolume(void) {
-	int oldVolume = _vm->music().volume() >> 2;
+	int oldVolume = _vm->music().getVolume() >> 2;
 	int newVolume = popVar();
 
 	// TODO: The game seems to expect the volume will only range from 0 - 63, so for now

Modified: scummvm/trunk/engines/cruise/sound.h
===================================================================
--- scummvm/trunk/engines/cruise/sound.h	2009-04-05 15:50:16 UTC (rev 39867)
+++ scummvm/trunk/engines/cruise/sound.h	2009-04-05 15:58:27 UTC (rev 39868)
@@ -55,7 +55,7 @@
 	~MusicPlayer();
 
 	void setVolume(int volume);
-	int getVolume() { return _masterVolume; }
+	int getVolume() const { return _masterVolume; }
 
 	void stop();
 	void pause();
@@ -73,7 +73,6 @@
 	bool songPlayed() const { return _songPlayed; }
 	bool isPlaying() const { return _isPlaying; }
 	bool looping() const { return _looping; }
-	byte volume() const { return _masterVolume; }
 	byte *songData() { return _songPointer; }
 	void setPlaying(bool playing) { _isPlaying = playing; }
 	void setLoop(bool loop) { _looping = loop; }


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