[Scummvm-cvs-logs] scummvm master -> 662649319b717632c66df840093eae37849effc4
bluegr
bluegr at gmail.com
Sun Dec 27 13:37:20 CET 2015
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bce260bb5f LAB: Get rid of _doReset
e4745a0b20 LAB: Remove incorrect mouse cursor hiding at the start of every anim
e2d019f9d1 LAB: Rename _lastMusicRoom to _curRoomMusic
684830082b LAB: Simplify resetMusic()
764d261873 LAB: Unify the sound flags code for music and sound effects
662649319b LAB: Simplify fillBuffer()
Commit: bce260bb5f2d3b573cc0c5a7c0085e18d1d46fd4
https://github.com/scummvm/scummvm/commit/bce260bb5f2d3b573cc0c5a7c0085e18d1d46fd4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-27T14:36:00+02:00
Commit Message:
LAB: Get rid of _doReset
This resulted in calling resetMusic() twice
Changed paths:
engines/lab/music.cpp
engines/lab/music.h
engines/lab/processroom.cpp
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index c46e3a1..4c889ca 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -58,7 +58,6 @@ Music::Music(LabEngine *vm) : _vm(vm) {
_musicOn = false;
_queuingAudioStream = nullptr;
_lastMusicRoom = 1;
- _doReset = true;
}
void Music::updateMusic() {
@@ -220,8 +219,6 @@ void Music::checkRoomMusic() {
changeMusic("Music:Laugh");
else if (_vm->_roomNum == DIMROOM)
changeMusic("Music:Rm81");
- else if (_doReset)
- resetMusic();
_lastMusicRoom = _vm->_roomNum;
}
diff --git a/engines/lab/music.h b/engines/lab/music.h
index 1a3fd24..2cd87cd 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -52,7 +52,6 @@ private:
Common::File *_file;
Common::File *_tFile;
- bool _doReset;
bool _musicOn;
bool _musicPaused;
bool _oldMusicOn;
@@ -125,7 +124,6 @@ public:
* Turns the music on and off.
*/
void setMusic(bool on);
- void setMusicReset(bool reset) { _doReset = reset; }
void stopSoundEffect();
/**
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index e0faa61..997eb75 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -386,12 +386,10 @@ void LabEngine::doActions(const ActionList &actionList) {
case kActionChangeMusic:
_music->changeMusic(action->_messages[0]);
- _music->setMusicReset(false);
break;
case kActionResetMusic:
_music->resetMusic();
- _music->setMusicReset(true);
break;
case kActionFillMusic:
Commit: e4745a0b20e6a61facc35f701466a76bf0ab7500
https://github.com/scummvm/scummvm/commit/e4745a0b20e6a61facc35f701466a76bf0ab7500
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-27T14:36:00+02:00
Commit Message:
LAB: Remove incorrect mouse cursor hiding at the start of every anim
This resulted in having the mouse cursor flash in scenes with animation
(e.g. the Surreal Maze)
Changed paths:
engines/lab/anim.cpp
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index ea7f568..0c01b07 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -99,8 +99,6 @@ void Anim::diffNextFrame(bool onlyDiffData) {
}
byte *endOfBuf = startOfBuf + (int)_diffWidth * _diffHeight;
- _vm->_event->mouseHide();
-
int curBit = 0;
while (1) {
Commit: e2d019f9d1048a35c7d6b862918e057218a5cab6
https://github.com/scummvm/scummvm/commit/e2d019f9d1048a35c7d6b862918e057218a5cab6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-27T14:36:00+02:00
Commit Message:
LAB: Rename _lastMusicRoom to _curRoomMusic
Changed paths:
engines/lab/music.cpp
engines/lab/music.h
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 4c889ca..114179b 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -57,7 +57,7 @@ Music::Music(LabEngine *vm) : _vm(vm) {
_musicOn = false;
_queuingAudioStream = nullptr;
- _lastMusicRoom = 1;
+ _curRoomMusic = 1;
}
void Music::updateMusic() {
@@ -212,7 +212,7 @@ void Music::setMusic(bool on) {
}
void Music::checkRoomMusic() {
- if ((_lastMusicRoom == _vm->_roomNum) || !_musicOn)
+ if ((_curRoomMusic == _vm->_roomNum) || !_musicOn)
return;
if (_vm->_roomNum == CLOWNROOM)
@@ -220,7 +220,7 @@ void Music::checkRoomMusic() {
else if (_vm->_roomNum == DIMROOM)
changeMusic("Music:Rm81");
- _lastMusicRoom = _vm->_roomNum;
+ _curRoomMusic = _vm->_roomNum;
}
void Music::changeMusic(const Common::String filename) {
diff --git a/engines/lab/music.h b/engines/lab/music.h
index 2cd87cd..a25d965 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -56,7 +56,7 @@ private:
bool _musicPaused;
bool _oldMusicOn;
- uint16 _lastMusicRoom ;
+ uint16 _curRoomMusic ;
uint32 _tLeftInFile;
uint32 _leftInFile;
Commit: 684830082b51ae1112c775e5c23b8a3e18727609
https://github.com/scummvm/scummvm/commit/684830082b51ae1112c775e5c23b8a3e18727609
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-27T14:36:01+02:00
Commit Message:
LAB: Simplify resetMusic()
Changed paths:
engines/lab/music.cpp
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 114179b..bcc534c 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -259,13 +259,8 @@ void Music::resetMusic() {
setMusic(false);
_vm->updateMusicAndEvents();
- if (!_oldMusicOn) {
- _tFile = 0;
- return;
- }
-
- _musicOn = _oldMusicOn;
- startMusic(false);
+ if (_oldMusicOn)
+ startMusic(false);
_tFile = 0;
}
Commit: 764d261873592605e142e2341850f2d1abcf8f85
https://github.com/scummvm/scummvm/commit/764d261873592605e142e2341850f2d1abcf8f85
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-27T14:36:01+02:00
Commit Message:
LAB: Unify the sound flags code for music and sound effects
Changed paths:
engines/lab/music.cpp
engines/lab/music.h
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index bcc534c..2bc51d3 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -60,6 +60,16 @@ Music::Music(LabEngine *vm) : _vm(vm) {
_curRoomMusic = 1;
}
+byte Music::getSoundFlags() {
+ byte soundFlags = Audio::FLAG_LITTLE_ENDIAN;
+ if (_vm->getPlatform() == Common::kPlatformWindows)
+ soundFlags |= Audio::FLAG_16BITS;
+ else if (_vm->getPlatform() == Common::kPlatformDOS)
+ soundFlags |= Audio::FLAG_UNSIGNED;
+
+ return soundFlags;
+}
+
void Music::updateMusic() {
if (!_musicOn || (getPlayingBufferCount() >= MAXBUFFERS))
return;
@@ -77,13 +87,7 @@ void Music::updateMusic() {
startMusicFlag = true;
}
- byte soundFlags = Audio::FLAG_LITTLE_ENDIAN;
- if (_vm->getPlatform() == Common::kPlatformWindows)
- soundFlags |= Audio::FLAG_16BITS;
- else if (_vm->getPlatform() == Common::kPlatformDOS)
- soundFlags |= Audio::FLAG_UNSIGNED;
-
- _queuingAudioStream->queueBuffer(musicBuffer, MUSICBUFSIZE, DisposeAfterUse::YES, soundFlags);
+ _queuingAudioStream->queueBuffer(musicBuffer, MUSICBUFSIZE, DisposeAfterUse::YES, getSoundFlags());
if (startMusicFlag)
_vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _queuingAudioStream);
@@ -100,18 +104,12 @@ void Music::playSoundEffect(uint16 sampleSpeed, uint32 length, bool loop, Common
if (sampleSpeed < 4000)
sampleSpeed = 4000;
- byte soundFlags = Audio::FLAG_LITTLE_ENDIAN;
- if (_vm->getPlatform() == Common::kPlatformWindows)
- soundFlags |= Audio::FLAG_16BITS;
- else
- soundFlags |= Audio::FLAG_UNSIGNED;
-
// NOTE: We need to use malloc(), cause this will be freed with free()
// by the music code
byte *soundData = (byte *)malloc(length);
dataFile->read(soundData, length);
- Audio::SeekableAudioStream *audioStream = Audio::makeRawStream((const byte *)soundData, length, sampleSpeed, soundFlags);
+ Audio::SeekableAudioStream *audioStream = Audio::makeRawStream((const byte *)soundData, length, sampleSpeed, getSoundFlags());
uint loops = (loop) ? 0 : 1;
Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, loops);
_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, loopingAudioStream);
diff --git a/engines/lab/music.h b/engines/lab/music.h
index a25d965..ae217d4 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -80,6 +80,8 @@ private:
*/
void startMusic(bool restartFl);
+ byte getSoundFlags();
+
public:
Music(LabEngine *vm);
Commit: 662649319b717632c66df840093eae37849effc4
https://github.com/scummvm/scummvm/commit/662649319b717632c66df840093eae37849effc4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-27T14:36:02+02:00
Commit Message:
LAB: Simplify fillBuffer()
Changed paths:
engines/lab/music.cpp
engines/lab/music.h
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 2bc51d3..ddb6fc9 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -74,11 +74,6 @@ void Music::updateMusic() {
if (!_musicOn || (getPlayingBufferCount() >= MAXBUFFERS))
return;
- // NOTE: We need to use malloc(), cause this will be freed with free()
- // by the music code
- byte *musicBuffer = (byte *)malloc(MUSICBUFSIZE);
- fillbuffer(musicBuffer);
-
// Queue a music block, and start the music, if needed
bool startMusicFlag = false;
@@ -87,7 +82,7 @@ void Music::updateMusic() {
startMusicFlag = true;
}
- _queuingAudioStream->queueBuffer(musicBuffer, MUSICBUFSIZE, DisposeAfterUse::YES, getSoundFlags());
+ _queuingAudioStream->queueBuffer(fillBuffer(), MUSICBUFSIZE, DisposeAfterUse::YES, getSoundFlags());
if (startMusicFlag)
_vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _queuingAudioStream);
@@ -124,7 +119,11 @@ bool Music::isSoundEffectActive() const {
return _vm->_mixer->isSoundHandleActive(_sfxHandle);
}
-void Music::fillbuffer(byte *musicBuffer) {
+byte *Music::fillBuffer() {
+ // NOTE: We need to use malloc(), cause this will be freed with free()
+ // by the music code
+ byte *musicBuffer = (byte *)malloc(MUSICBUFSIZE);
+
if (MUSICBUFSIZE < _leftInFile) {
_file->read(musicBuffer, MUSICBUFSIZE);
_leftInFile -= MUSICBUFSIZE;
@@ -136,6 +135,8 @@ void Music::fillbuffer(byte *musicBuffer) {
_file->seek(0);
_leftInFile = _file->size();
}
+
+ return musicBuffer;
}
void Music::startMusic(bool restartFl) {
diff --git a/engines/lab/music.h b/engines/lab/music.h
index ae217d4..47c538e 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -66,7 +66,7 @@ private:
Audio::QueuingAudioStream *_queuingAudioStream;
private:
- void fillbuffer(byte *musicBuffer);
+ byte *fillBuffer();
uint16 getPlayingBufferCount();
/**
More information about the Scummvm-git-logs
mailing list