[Scummvm-cvs-logs] SF.net SVN: scummvm: [28698] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28698
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28698&view=rev
Author:   thebluegr
Date:     2007-08-22 09:00:45 -0700 (Wed, 22 Aug 2007)

Log Message:
-----------
Implemented music pause and resume

Modified Paths:
--------------
    scummvm/trunk/engines/saga/music.cpp
    scummvm/trunk/engines/saga/music.h

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2007-08-22 15:28:31 UTC (rev 28697)
+++ scummvm/trunk/engines/saga/music.cpp	2007-08-22 16:00:45 UTC (rev 28698)
@@ -578,11 +578,13 @@
 }
 
 void Music::pause(void) {
-	//TODO: do it
+	_player->setVolume(-1);
+	_player->setPlaying(false);
 }
 
 void Music::resume(void) {
-	//TODO: do it}
+	_player->setVolume(_vm->_musicVolume == 10 ? 255 : _vm->_musicVolume * 25);
+	_player->setPlaying(true);
 }
 
 void Music::stop(void) {

Modified: scummvm/trunk/engines/saga/music.h
===================================================================
--- scummvm/trunk/engines/saga/music.h	2007-08-22 15:28:31 UTC (rev 28697)
+++ scummvm/trunk/engines/saga/music.h	2007-08-22 16:00:45 UTC (rev 28698)
@@ -50,6 +50,7 @@
 	~MusicPlayer();
 
 	bool isPlaying() { return _isPlaying; }
+	void setPlaying(bool playing) { _isPlaying = playing; }
 
 	void setVolume(int volume);
 	int getVolume() { return _masterVolume; }


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