libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PINK: implement sound balance

Browse Source
This commit is contained in:
whiterandrek 2018-06-09 22:21:16 +03:00 committed by Eugene Sandulenko
parent 30b5c30ab2
commit f11d331129
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/pink/objects/actions/action_play_with_sfx.cpp
View File

@ -74,24 +74,28 @@ void ActionPlayWithSfx::updateSound() {
for (uint i = 0; i < _sfxArray.size(); ++i) {
if (_sfxArray[i]->getFrame() == _decoder->getCurFrame())
_sfxArray[i]->play(_actor->getPage());
_sfxArray[i]->play();
}
}
void ActionSfx::deserialize(Pink::Archive &archive) {
_frame = archive.readDWORD();
_volume = archive.readDWORD();
assert(_volume <= 100);
_sfxName = archive.readString();
archive.readObject(); // pointer of ActionPlayWithSfx
_sprite = (ActionPlayWithSfx*) archive.readObject();
}
void ActionSfx::toConsole() {
debug("\t\tActionSfx: _sfx = %s, _volume = %u, _frame = %u", _sfxName.c_str(), _volume, _frame);
}
void ActionSfx::play(Page *page) {
if (!_sound.isPlaying())
_sound.play(page->getResourceStream(_sfxName), Audio::Mixer::kSFXSoundType, _volume);
void ActionSfx::play() {
Page *page = _sprite->getActor()->getPage();
if (!_sound.isPlaying()) {
int8 balance = (_sprite->getDecoder()->getX() * 396875 / 1000000) - 127;
_sound.play(page->getResourceStream(_sfxName), Audio::Mixer::kSFXSoundType, _volume, balance);
}
}
} // End of namespace Pink

3
engines/pink/objects/actions/action_play_with_sfx.h
View File

@ -58,11 +58,12 @@ public:
void toConsole() override;
void play(Page *page);
void play();
uint32 getFrame() { return _frame; }
private:
ActionPlayWithSfx *_sprite;
Common::String _sfxName;
Sound _sound;
uint32 _volume;

1
engines/pink/objects/actions/action_sound.cpp
View File

@ -39,6 +39,7 @@ void ActionSound::deserialize(Archive &archive) {
Action::deserialize(archive);
_fileName = archive.readString();
_volume = archive.readDWORD();
assert(_volume <= 100);
_isLoop = (bool) archive.readDWORD();
_isBackground = (bool) archive.readDWORD();
}

5
engines/pink/objects/actions/action_talk.cpp
View File

@ -60,7 +60,10 @@ void ActionTalk::pause(bool paused) {
void ActionTalk::onStart() {
ActionPlay::onStart();
_sound.play(_actor->getPage()->getResourceStream(_vox), Audio::Mixer::kSpeechSoundType);
//sound balance is calculated different than in ActionSfx(probably a bug in original)
// 30.0 - x * -0.0625 disasm (0 - 100)
int8 balance = (_decoder->getX() * 396875 / 1000000) - 127;
_sound.play(_actor->getPage()->getResourceStream(_vox), Audio::Mixer::kSpeechSoundType, 100, balance);
}
} // End of namespace Pink

2
engines/pink/objects/actions/action_talk.h
View File

@ -45,8 +45,8 @@ protected:
void onStart() override;
private:
Sound _sound;
Common::String _vox;
Sound _sound;
};
} // End of namespace Pink