[Scummvm-cvs-logs] SF.net SVN: scummvm: [31686] scummvm/trunk/engines/made
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Apr 24 15:12:08 CEST 2008
Revision: 31686
http://scummvm.svn.sourceforge.net/scummvm/?rev=31686&view=rev
Author: thebluegr
Date: 2008-04-24 06:12:08 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/made/music.cpp
scummvm/trunk/engines/made/music.h
Modified: scummvm/trunk/engines/made/music.cpp
===================================================================
--- scummvm/trunk/engines/made/music.cpp 2008-04-24 13:05:14 UTC (rev 31685)
+++ scummvm/trunk/engines/made/music.cpp 2008-04-24 13:12:08 UTC (rev 31686)
@@ -173,19 +173,12 @@
delete[] _midiMusicData;
}
-void Music::setVolume(int volume, int time) {
- _targetVolume = volume * 2; // ScummVM has different volume scale
- _currentVolumePercent = 0;
-
+void Music::setVolume(int volume) {
if (volume == -1) // Set Full volume
volume = 255;
- if (time == 1) {
- _player->setVolume(volume);
- _currentVolume = volume;
- return;
- }
-
+ _player->setVolume(volume);
+ _currentVolume = volume;
}
bool Music::isPlaying() {
@@ -193,20 +186,16 @@
}
void Music::play(XmidiResource *midiResource, MusicFlags flags) {
- MidiParser *parser;
+ MidiParser *parser = 0;
byte *resourceData;
size_t resourceSize;
debug(2, "Music::play %d", flags);
- if (!_enabled) {
+ if (!_enabled || isPlaying()) {
return;
}
- if (isPlaying()) {
- return;
- }
-
_player->stopMusic();
/*
Modified: scummvm/trunk/engines/made/music.h
===================================================================
--- scummvm/trunk/engines/made/music.h 2008-04-24 13:05:14 UTC (rev 31685)
+++ scummvm/trunk/engines/made/music.h 2008-04-24 13:12:08 UTC (rev 31686)
@@ -121,7 +121,7 @@
void resume(void);
void stop(void);
- void setVolume(int volume, int time = 1);
+ void setVolume(int volume);
int getVolume() { return _currentVolume; }
int32 *_songTable;
@@ -135,9 +135,7 @@
int _enabled;
bool _adlib;
- int _targetVolume;
int _currentVolume;
- int _currentVolumePercent;
MidiParser *xmidiParser;
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