jeremy
c8c06ceee9
Fixed SoundManager::stopSound when output is not initialized (bug #4600 probably)
2019-07-04 22:48:33 +02:00
Capostrophic
e095d51999
More queue handling adjustments
2019-05-26 19:23:42 +03:00
Capostrophic
c975dab7c3
Update say sound queue explicitly once per frame
2019-05-26 18:46:53 +03:00
Capostrophic
4c2b694b29
Make SayDone return 1 on the frame speech is started (bug #4879 )
2019-05-26 18:00:50 +03:00
Capostrophic
6e98cd8eaa
Increase music crossfade time to 1 second
2019-04-25 20:26:40 +03:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback
...
Make fallback map static to simplify constructors
2019-04-07 17:43:59 +02:00
Capostrophic
af80eddc0e
Use loudness data for 2D voiceover (bug #4947 )
2019-04-04 19:07:29 +03:00
Andrei Kortunov
a302ec9c65
Make fallback map static to simplify constructors
2019-03-29 15:30:49 +04:00
Capostrophic
abae35e88b
Loop title screen music (bug #4896 )
2019-03-17 21:05:52 +03:00
Capostrophic
d1967562a3
Fix the last audio packet getting lost
2019-03-09 21:25:16 +03:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
2018-12-24 14:19:35 -05:00
Bret Curtis
419e7ea5a2
Merge pull request #2035 from akortunov/coverity
...
Fix many Coverity Scan warnings
2018-11-14 09:44:30 +01:00
Andrei Kortunov
4ee15ddcb9
Fix many Coverity Scan warnings
2018-11-14 11:21:49 +04:00
Andrei Kortunov
d2613e35a2
Fix some Clang 7 warnings
2018-11-09 19:42:59 +04:00
Andrei Kortunov
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
2018-11-03 22:34:25 +04:00
Andrei Kortunov
8fa0ffcfe4
Catch exceptions inside the loadVoice() (bug #4685 )
2018-10-18 15:02:23 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Andrei Kortunov
70ed8fd1a9
Use constants instead of widely used magic numbers (task #4645 )
2018-09-17 19:22:50 +04:00
Andrei Kortunov
d5bcc49079
Initialize missing struct fields
2018-09-11 11:11:24 +04:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Chris Robinson
c2b3ca9638
Update some comments
...
It wasn't actually a bug in OSX like the comment said, but intended behavior.
2018-08-25 01:24:35 -07:00
Chris Robinson
4e3ae85c11
Set the OpenAL source offset after setting the buffer
...
This is to work around a bug in the Rapture3D driver.
2018-08-25 01:24:35 -07:00
Andrei Kortunov
5a4d0cec3a
Use new logging system for game itself
2018-08-14 23:05:43 +04:00
Capostrophic
16af1a6c1c
Replace 0 sound range values separately
2018-08-02 12:40:53 +03:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
Andrei Kortunov
2854f6ca83
Handle exception if we try to play non-music file (bug #4416 )
2018-06-14 21:32:40 +04:00
Bret Curtis
67c381df4e
Merge pull request #1708 from akortunov/refidfix
...
fix GCC warnings
2018-05-16 15:59:31 +02:00
Andrei Kortunov
a68de93308
Initialize srate variable in openal_output
2018-05-16 16:34:58 +04:00
Andrei Kortunov
e5db5e2651
Fix 'maybe-uninitialized' warning in openal_output
2018-05-16 16:13:22 +04:00
Andrei Kortunov
b15bed8e22
Avoid excessive loadSound calls
2018-05-07 20:40:53 +04:00
Andrei Kortunov
4872edc5ed
Prevent PlaySound overlapping
2018-05-01 16:24:32 +04:00
scrawl
f0507e6b46
Merge pull request #1686
2018-04-25 10:27:38 +00:00
Capostrophic
9073e4d4ba
Initialize playlist file list in playPlaylist ( fixes #4134 )
2018-04-22 23:21:29 +03:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
Chris Robinson
08e947319a
Restore exception throwing to the decoder
2017-12-09 11:00:56 -08:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Chris Robinson
074be7d7c6
Remove a function from the sound manager interface
2017-09-18 01:28:39 -07:00
Chris Robinson
41bb35655b
Avoid an extra call to get the buffer size
2017-09-16 16:25:32 -07:00
Chris Robinson
5c53ee42a1
Prepare all Sound_Buffers when retrieving the first one
2017-09-16 16:25:32 -07:00
Chris Robinson
4b448c74d2
Use range-for loops instead of for_each
2017-09-16 16:25:32 -07:00
Chris Robinson
1e729e8da9
Avoid more explicit loops
2017-09-16 16:25:32 -07:00
Chris Robinson
9dbb713b7c
Print a bit more information for sound initialization
2017-09-16 16:25:32 -07:00
Chris Robinson
acd6d9cd72
Try opening the default device fallback in OpenAL_Output
2017-09-16 16:25:32 -07:00
Chris Robinson
d68e1581ee
Use an std::array for the OpenAL stream buffers
2017-09-15 05:40:20 -07:00
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
2017-09-15 02:36:59 -07:00
Chris Robinson
0c1ad7c74e
Replace a few more explicit loops
2017-09-15 02:36:46 -07:00
Chris Robinson
1e123a22e1
Avoid some explicit loops
2017-09-14 16:56:46 -07:00
Chris Robinson
3757571d46
Set HRTF when initializing the device
2017-09-14 16:00:43 -07:00
Chris Robinson
c17edfd547
Don't be so throw-happy in the sound manager
2017-09-14 16:00:43 -07:00
Chris Robinson
abe80f5868
Move the soundlist when updating a Ptr instead of copying
2017-09-14 16:00:43 -07:00
Chris Robinson
605c937572
Ensure 3D sources are spatialized
...
Standard OpenAL does not spatialize non-mono sounds, although the game has some
stereo sounds meant to play in 3D. The desired behavior can be achieved with
the AL_SOFT_source_spatialize extension.
2017-09-14 16:00:43 -07:00
Chris Robinson
6f57233ba1
Avoid copying the same Ptr with each iteration
2017-09-14 16:00:42 -07:00
Chris Robinson
edfba68eb5
Apply reverb and a low-pass filter when underwater
...
This replaces the pitch-shift effect when available.
2017-09-14 16:00:42 -07:00
Chris Robinson
27eeaf90d0
Use unordered_map for the music playlist and sound buffer caches
2017-09-14 16:00:42 -07:00
Chris Robinson
033303b911
Properly update the near water sound volume
2017-09-14 16:00:42 -07:00
Chris Robinson
0b720cd90c
Set the appropriate meter/unit scale for sound
2017-09-14 16:00:41 -07:00
Chris Robinson
c790fedd3f
Load an effect and filter for underwater
2017-09-14 16:00:41 -07:00
Chris Robinson
3d37cb3cf6
Load EFX functions when available
2017-09-14 16:00:41 -07:00
Chris Robinson
c5a3fb7ccd
Simplify checking for near water sfx change
...
Rather than checking every frame you're near the water, only check when the
current cell changed (the sfx will only change when moving between interior and
exterior). It also doesn't need to look through all playing sounds, as it's a
local one not attached to a Ptr.
2017-09-14 16:00:41 -07:00
Chris Robinson
617c05f557
Make Sound and Stream sibling types
...
To avoid being able to accidentally cast a Stream* to a Sound*, or vice-versa.
2017-09-14 16:00:40 -07:00
Chris Robinson
9e45f6d05f
Make a note that stopTrack needs to be called for a stopping track
2017-09-14 16:00:40 -07:00
Chris Robinson
9e7a49f66e
Include alext.h to get OpenAL extension definitions
2017-09-14 16:00:40 -07:00
Chris Robinson
1fe60dd8e2
Replace some shared_ptrs with pointers to deque entries
2017-09-14 16:00:30 -07:00
Andrei Kortunov
1aaa8a76c5
Allow to play only one copy of given sound at time (bug #3647 )
2017-08-31 16:14:48 +04:00
Harry
86ae2ae395
Improved shuffle ( #1412 )
2017-08-25 20:08:49 +00:00
scrawl
f0dea8b8e6
Revert "Implement a Fisher-Yates shuffle on background music"
2017-08-20 20:20:27 +00:00
Harry
2a85c5f011
Implement a Fisher-Yates shuffle on background music
...
This fixes sometimes getting repetitive background music
2017-08-19 14:48:00 -04:00
Lennart Bernhardt
546352dbe3
avoid starting sound updates more than necessary
2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45
remove redundant mMusicFader variable
2017-08-08 03:17:40 +02:00
Lennart Bernhardt
60a7d3d6e0
Fade out music before change occurs
2017-08-06 20:10:56 +02:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
MiroslavR
d24bcbac15
Do not apply underwater effects to player's voice ( Fixes #3850 )
2017-04-30 18:51:49 +02:00
scrawl
5a939418fc
Add missing avcodec_close ( Fixes #3741 )
2017-02-06 15:49:13 +01:00
Jules Blok
e9d8ff532f
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
...
This works around a bug in the MacOS OpenAL implementation.
2016-12-29 01:03:13 +01:00
MiroslavR
c34d85ffc2
Implement water sounds ( Closes #451 )
2016-11-28 21:34:58 +01:00
scrawl
530fb61ad0
Use OpenThreads instead of boost thread
...
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.
With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.
So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread
This patch opts for 3.)
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
2016-10-10 18:23:06 +02:00
scrawl
509e5dfe4d
Include cleanup
2016-06-27 22:10:30 +02:00
scrawl
4699a8098b
Include fix
2016-06-27 21:51:18 +02:00
scrawl
1739351b7a
Remove now unused Sound_Decoder::rewind()
2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0
Don't analyze the loudness for sounds that don't need it
2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb
Analyze the loudness data as the stream is decoded for playback
...
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.
The benefit is that we need to decode the audio just once instead of twice.
We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
2016-06-27 21:32:54 +02:00
scrawl
dfc2f3469a
Don't play music if no playlist is set
2016-06-07 01:36:09 +02:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
604b5d24e9
Use a ConstPtr in SoundManager
2015-12-18 18:11:30 +01:00
scrawl
4553db7b43
Merge pull request #861 from scrawl/soundcrash
...
Fix crash when running out of sound sources
2015-12-15 18:23:03 +01:00
scrawl
6a749e77f2
Fix crash when running out of sound sources
2015-12-15 15:12:48 +01:00
Chris Robinson
cddea4a99c
Start underwater sound after updating sounds
...
In between the startUpdate/finishUpdate calls, changes are deferred so that
they can happen all at once. This includes starting sounds, so when the
underwater sound is started it will be immediately checked to see if it's
playing. Since it's not yet playing, it'll be seen as stopped and get cleaned
up before ever playing.
2015-12-14 14:05:01 -08:00
Chris Robinson
f47f0a996f
Stop the object's old say sound before playing the new one
2015-12-11 15:49:45 -08:00
Chris Robinson
7fc2df153a
Rename stopSound/stopStream to finishSound/finishStream
...
Since they're also used to clean up output resources, not just stopping.
2015-12-11 15:13:14 -08:00
Chris Robinson
808f701013
Use the actor's Head position for Say streams
2015-12-10 17:48:45 -08:00
Chris Robinson
a00a4bce77
Avoid some unnecessary indirection
2015-12-10 16:33:27 -08:00
scrawl
1264651af7
Fix coverity defects
2015-12-08 21:12:05 +01:00
scrawl
e69750905a
Fix gcc warning about function casts
2015-12-08 16:51:50 +01:00
Chris Robinson
c75303b652
Add an option to select and enable HRTF
2015-12-05 17:14:53 -08:00
scrawl
53158d29b1
stopSound crash fix
2015-12-05 01:54:16 +01:00
