mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2304 from Capostrophic/voiceover

Browse source 
Use loudness data for 2D voiceover (bug #4947)
This commit is contained in:
Bret Curtis 2019-04-04 19:54:29 +02:00 committed by GitHub
commit 2efdb71a87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -52,6 +52,7 @@
Bug #4922: Werewolves can not attack if the transformation happens during attack Bug #4922: Werewolves can not attack if the transformation happens during attack
Bug #4938: Strings from subrecords with actually empty headers can't be empty Bug #4938: Strings from subrecords with actually empty headers can't be empty
Bug #4942: Hand-to-Hand attack type is chosen randomly when "always use best attack" is turned off Bug #4942: Hand-to-Hand attack type is chosen randomly when "always use best attack" is turned off
Bug #4947: Player character doesn't use lip animation
Bug #4948: Footstep sounds while levitating on ground level Bug #4948: Footstep sounds while levitating on ground level
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file Feature #3442: Default values for fallbacks from ini file

4
apps/openmw/mwsound/openal_output.cpp
View file

@ -1247,7 +1247,7 @@ void OpenAL_Output::updateSound(Sound *sound)
} }
bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream *sound) bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream *sound, bool getLoudnessData)
{ {
if(mFreeSources.empty()) if(mFreeSources.empty())
{ {
@ -1265,7 +1265,7 @@ bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream *sound)
return false; return false;
OpenAL_SoundStream *stream = new OpenAL_SoundStream(source, std::move(decoder)); OpenAL_SoundStream *stream = new OpenAL_SoundStream(source, std::move(decoder));
if(!stream->init()) if(!stream->init(getLoudnessData))
{ {
delete stream; delete stream;
return false; return false;

2
apps/openmw/mwsound/openal_output.hpp
View file

@ -75,7 +75,7 @@ namespace MWSound
virtual bool isSoundPlaying(Sound *sound); virtual bool isSoundPlaying(Sound *sound);
virtual void updateSound(Sound *sound); virtual void updateSound(Sound *sound);
virtual bool streamSound(DecoderPtr decoder, Stream *sound); virtual bool streamSound(DecoderPtr decoder, Stream *sound, bool getLoudnessData=false);
virtual bool streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData); virtual bool streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData);
virtual void finishStream(Stream *sound); virtual void finishStream(Stream *sound);
virtual double getStreamDelay(Stream *sound); virtual double getStreamDelay(Stream *sound);

2
apps/openmw/mwsound/sound_output.hpp
View file

@ -45,7 +45,7 @@ namespace MWSound
virtual bool isSoundPlaying(Sound *sound) = 0; virtual bool isSoundPlaying(Sound *sound) = 0;
virtual void updateSound(Sound *sound) = 0; virtual void updateSound(Sound *sound) = 0;
virtual bool streamSound(DecoderPtr decoder, Stream *sound) = 0; virtual bool streamSound(DecoderPtr decoder, Stream *sound, bool getLoudnessData=false) = 0;
virtual bool streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData) = 0; virtual bool streamSound3D(DecoderPtr decoder, Stream *sound, bool getLoudnessData) = 0;
virtual void finishStream(Stream *sound) = 0; virtual void finishStream(Stream *sound) = 0;
virtual double getStreamDelay(Stream *sound) = 0; virtual double getStreamDelay(Stream *sound) = 0;

2
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -319,7 +319,7 @@ namespace MWSound
if(playlocal) if(playlocal)
{ {
sound->init(1.0f, basevol, 1.0f, PlayMode::NoEnv|Type::Voice|Play_2D); sound->init(1.0f, basevol, 1.0f, PlayMode::NoEnv|Type::Voice|Play_2D);
played = mOutput->streamSound(decoder, sound); played = mOutput->streamSound(decoder, sound, true);
} }
else else
{ {