85850c7440
Fix DEFAULT_OUTPUT declaration
12 years ago
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
12 years ago
3b7edae7c3
Don't hold a list of all sound sources
12 years ago
fe36cc1de7
Don't try to resume sound types that aren't paused
12 years ago
2f8daec379
Allow pausing only certain types of sounds
12 years ago
b4e36d4f31
Add a method to get the volume from the sound type
12 years ago
a5356e194e
Allow specifying a type for the playTrack method
12 years ago
72ffceb206
Add type flags to the sound play mode
12 years ago
dd3e568a00
Set the sound properties at initialization
12 years ago
20321c4552
Keep track of the actual active sounds
12 years ago
d348435a1d
Improve audio open error message
12 years ago
e9d833be03
Use the packet pts to calculate the decoder sample offset
12 years ago
1a771ae671
Merge the stream struct into the parent decoder
12 years ago
5fff1c4e47
Update the ffmpeg decoder to use avcodec_decode_audio4
12 years ago
5f4c33f896
Only store one packet at a time
12 years ago
9d86890d9d
Only use one stream for the ffmpeg decoder
12 years ago
32b0a5d96e
Update the queued sample count immediately
12 years ago
0a5ab977b7
Use the decoder's sample offset for calculating the stream offset
12 years ago
1ea1407707
Support quad, 5.1, and 7.1 with OpenAL and ffmpeg
...
The other decoders don't guarantee any channel ordering, which makes them
useless.
12 years ago
f067b22b3f
Use a recursive mutex for the OpenAL stream thread
12 years ago
ba9c5f5b4e
Don't initially fill buffers in OpenAL_SoundStream::play
12 years ago
779ced0889
Add a method to play an audio track with a custom decoder
12 years ago
1571243ef0
Implement getTimeOffset for OpenAL_SoundStream
12 years ago
86bf6388c6
Pass a decoder to the playStream sound output method
12 years ago
9c831d3039
Add a decoder method to get the "file" name
12 years ago
34e36fb852
Add a method to get the time offset from sounds
12 years ago
7fd9e1d212
Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
12 years ago
18d8c767bd
fix a bunch of warnings, improved error handling, initialize texture to black
12 years ago
2c1eceb9f0
Add methods to pause and stop all playing sounds (and music)
12 years ago
973b5faf25
Keep track of all allocated sources
12 years ago
c2e1595445
Treat paused sounds as still playing
12 years ago
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
12 years ago
e3dd3d565c
fix 2 leaks
12 years ago
d432420a32
fix FindFFmpeg.cmake
12 years ago
5f7d349126
several missing includes
12 years ago
e628b23da6
applying new interface vol.3, inconsistent
12 years ago
d205723a17
resolving m prefix/ESMStore movement
12 years ago
2057f5619e
move ESMStore to MWWorld
12 years ago
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
12 years ago
1a2034b4dd
training window
12 years ago
35d099a638
disabling gcc extensions
12 years ago
35d7b5e5b0
Merge remote-tracking branch 'greye/record_saving'
12 years ago
6c5c9ce46e
Avoid console spam when a sound can't play
12 years ago
6942fa97da
Specify a proper up vector for the listener
12 years ago
991f942fba
Merge remote-tracking branch 'zini/master' into sound
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.cpp
apps/openmw/mwsound/soundmanagerimp.hpp
12 years ago
7606ebafd6
resolving conflicts, minor update
12 years ago
81463fa23d
Issue #372 : fixed positions in SoundManager
13 years ago
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
13 years ago
b5bc7bc424
SoundManager dependency on camera pos/dir
13 years ago
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
13 years ago
df60f4bf92
stub for soundmanager, adjust rotation mode
13 years ago
ec9cf4d3c6
rotateObject() added, input system rewritten
13 years ago
0e934a52ca
Include soundmanager.hpp for Play_Normal enum
13 years ago
1c53add6c4
Include boost/shared_ptr.hpp for boost:shared_ptr
13 years ago
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
13 years ago
87667ab57e
Issue #107 : Ptr related include cleanup
13 years ago
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
2f8056dfab
Merge remote branch 'zini/master' into sound
13 years ago
0f71439991
Merge remote branch 'garvek/master'
13 years ago
fc3a3fc173
MSVC build compliance:
...
- static const float member is not ISO
- callback do not match DLL signature
13 years ago
c85c794c86
fixed some cppcheck issues
13 years ago
05fd8f0211
Update the actual sounds and music volume when settings change
13 years ago
cbe89f7e32
copy&paste mistake
13 years ago
189b044392
small correction
13 years ago
9b94edd561
audio tab with volume sliders
13 years ago
c9aa0ca1f4
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
13 years ago
1627206d56
Remove an unused method
...
Best not to design something we don't yet know what's needed from it.
13 years ago
144d52cf49
Add voices to the chargen class questions
13 years ago
b3caf82714
Avoid using vector<>::data(), which requires C++11
13 years ago
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
59ccab0b2c
Add sound volume settings
13 years ago
752e89a268
Add a setting to select the sound device name
13 years ago
b8be867e6e
Work around a bug in the Windows OpenAL router
13 years ago
87e8917c4d
Don't try to play sounds when no sound output is initialized
13 years ago
63e0e82049
Implement an Audiere-based decoder
13 years ago
2147210ad7
Don't set an underwater environment when there's no water
13 years ago
9c06bfc8fc
Merge remote branch 'zini/master' into sound
13 years ago
64f792c01d
Fix a value defined at the wrong place
13 years ago
e8e8d3fb1b
Fully reset the music before starting the next track
13 years ago
3a57746ee4
Remove an unneeded volume special-case
13 years ago
4944a29b21
Keep track of the sound pitch
13 years ago
cbf6c0404a
Implement a basic underwater sound environment
13 years ago
575474ff69
Pass the mode flags to the sound output play methods
13 years ago
977e7ac9a3
Remove the Play_Single flag. It's not correct.
13 years ago
ae308b9b5f
Use a set of flags instead of separate booleans
13 years ago
e48d125a84
Only allow one instance of a given tracked soundid
...
The untracked flag should probably be broken up and combined with the loop
boolean into a set of flags.
13 years ago
bfac946878
Finally "fix" --nosound
...
Expect degraded performance with it. Looping sounds are constantly checked to
see if they're playing, and try to play it again when it's not.
13 years ago
7541e08909
Don't reset the sound Output device if init fails
13 years ago
28378c063b
Minor OpenAL_SoundStream cleanups
13 years ago
4e908aa095
Add a method to set the sound's position
13 years ago
b01289128b
Split OpenAL_Sound into separate classes for 2D and 3D sounds
13 years ago
5adeee20fd
Mute sounds that go outside the max distance
13 years ago
fc167dbc83
Pass Ogre Vector3s to playSound3D and updateListener
13 years ago
fefc8f86ab
Remove the unused streamSound3D method
13 years ago
1ee8b963d0
Store the sound listener position as well
13 years ago
fad27d99e6
Update the actual sound volume with the position
13 years ago
479df78ea1
Update the actual sound position after the listener
13 years ago
71d9d7e943
Store the current sound position with the Sound object
13 years ago
de102cd274
Simplify broken OpenAL workaround
13 years ago
33a63d88a5
Merge remote branch 'zini/master' into sound
13 years ago
b6aa8925f4
(Temporary) workaround for broken OpenAL implementations that doesn't return meaningful max counts of sources
13 years ago
3d5384e2bb
Remove some unneeded casts
13 years ago
20f976ddc7
probably openal initialization fix
13 years ago
bedf56a237
Merge remote branch 'zini/next' into sound
13 years ago
be337ef7cc
Return SoundPtr objects from playSound[3D]
...
Note that each Sound object currently contains "precious" resources even after
the sound is stopped. The reference should be reliquished as soon as it's no
longer needed (the SoundManager will make sure the sound continues to play
until it's finished).
13 years ago
293f33914e
Use a deque fpr OpenAL's free sources
13 years ago
a3291ef360
Add a sound method to update the volume
13 years ago
7008bd2fe1
Store some sound properties in the Sound class
13 years ago
c072babd17
Better handle bad OpenAL source counts
13 years ago
089c340935
Switch the map so the SoundPtr is used as a key
13 years ago
a996cfed71
Merge remote branch 'ace/win-fixes' into next
13 years ago
c6c06f1140
Return SoundPtr objects from the playSound and streamSound methods
13 years ago
f0db2ab82f
Split stopSound3D into separate functions to deal with stopping all sounds on an object
13 years ago
033faba9c4
Make a function parameter const
13 years ago
c2611d035c
Use a pair to match the MWWorld::Ptr object and sound ID, instead of nested maps
13 years ago
55f1053b4f
Windows fixes for compiling and linking
13 years ago
be94da1527
Issue #225 : Initialize class members in constructor.
13 years ago
0d552c10bc
Use an empty MWWorld::Ptr object for non-3D sounds
13 years ago
7b3ecc290e
Fix compilation with older OpenAL headers
13 years ago
3e98e28059
Use a better method to get a more even randomization
13 years ago
71d3f9bd51
Get the object reference's position once when updating its sounds
13 years ago
5cb90ab704
Add some dummy copy constructors and assignment operators to prevent implicit versions from being used
13 years ago
fa70a72b75
Remove some unused sound manager fields and constructor parameters
13 years ago
1ccddefe28
Properly report the default device when opening sound fails
13 years ago
2f0af42261
Use the ALC_ENUMERATE_ALL_EXT extension with OpenAL when available
13 years ago
277597c567
Fix DEFAULT_OUTPUT for OpenAL_Output
13 years ago
2e28819243
Avoid trying to play an ambient sound if there's no chance for any to play
13 years ago
bac6df5563
Avoid leaking an ffmpeg stream
13 years ago
15317796bf
Handle the wav -> mp3 extension conversion in the sound output backend
13 years ago
f11e3e39a1
Add an enumerate method to the sound output interface
13 years ago
366c97c492
Use a separate method to check for finished sounds and update the listener
13 years ago
e6fe1c0261
Remove a mostly unneeded wrapper function
13 years ago
aecc77a73c
Replace the sound file extension when opening fails
...
This should make it more efficient to lookup a sound instead of checking each
time it's played. A better method would perhaps be to check if the resource
exists when the ESM is loaded and replace it then as needed.
13 years ago
8056a7f20b
Throw an exception when looking up a sound instead of returning an empty string
13 years ago
9a139f511f
Avoid redefining SOUND_IN
13 years ago
56c3b988cc
Avoid copying the region when looking for a sound to play
13 years ago
8c5f85ca83
Use a local variable to mark sound streams as finished while processing
...
This avoids a race condition where the source can underrun while the final
buffers are being queued and the sound can be detected as stopped
13 years ago
6a85ef1229
Set Ogre's data stream to NULL when closing the audio file
13 years ago
0d973ac8ff
Use the vector's data field instead of the address of the first element
...
Same thing really, but less convoluted
13 years ago
fd8326e958
Better handle some ffmpeg errors
13 years ago
7b22ee6fd1
Use for_each to clear the ffmpeg stream packets
13 years ago
2989a1e06e
Improve ffmpeg failure messages
13 years ago
26a441f29a
Add a readAll method to the sound decoder, for potentially more efficient reading
13 years ago
deb473b9ae
Implement the ffmpeg decoder
13 years ago
9a48002025
Fix compilation of the FFmpeg decoder
13 years ago
e48745b68e
Fix streamMusic's path lookup
13 years ago
fc27d5cc19
Restore music playback
13 years ago
5ae47f783e
Use the sound manager's update to make sure music is still playing
13 years ago
0261aac518
Use Ogre's resource group manager to handle sound files
13 years ago
80dbf82a74
Explicitly stop sounds instead of relying on their deletion to do it
13 years ago
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
13 years ago
fd37a4827c
Enforce a 15MB limit on the sound buffer cache
13 years ago
04638516b2
Check for stopped active sounds too and remove them
13 years ago
6c45d6668b
Cache OpenAL buffers for easy reuse
13 years ago
91821ccd8c
Add the sound stream to the thread after resetting the mIsFinished flag
13 years ago
db46bf39b3
Add a rewind method to the sound decoder
13 years ago
afa2cb6de7
Stop trying to read decoded audio once it's finished
13 years ago
4f69972a9c
Add a method to stream a sound in 3D
13 years ago
ae8218bf03
Allocate OpenAL sources when opening the device
...
This allows sources to be more efficiently retrieved and returned
13 years ago
8f9d4ff841
Use 6 125ms buffers for OpenAL streams
13 years ago
dc6354b2f9
Add functions to get string names for sample types and channel configs
13 years ago
4a0b5b7918
Increase the sound stream thread sleep time to 50ms
13 years ago
4698e8c0a2
Make the sound stream thread object per-device
13 years ago
2c27827e4f
Add some comment markers to the OpenAL sound classes
13 years ago
e234b90173
Use a loop to find the OpenAL format from the decoder format
13 years ago
6a256d3993
Make sure the OpenAL stream list is clear before shutting down
13 years ago
7194114669
Use a background thread to keep OpenAL streams fed
...
Maybe this could be moved to the SoundManager instead of in OpenAL, but it's
good enough for now.
13 years ago
d10b18b0f3
Removed a couple of warnings with nosound
13 years ago
f567950e25
Fix for the --nosound crash
13 years ago
b938fd7b36
Make the sound output init return void
13 years ago
1965b5bc79
Rename some Sound class member functions
13 years ago
403e51cef3
Move the sample type and channel config enums to MWSound and give use appropriate names for the values
13 years ago
efae7dfe83
Rename some sound decoder class member variables and functions
13 years ago
9656456d30
Make sure the sound decoders are closed when they're finished with
13 years ago
362e254720
Rename some more sound class member variables and functions
13 years ago
162642e672
Prefix some SoundManager class member variables
13 years ago
2f92559fc7
Use OpenAL's linear attenuation model
...
We should use the inverse distance clamped model (the default), but we first
need to handle muting sounds that are beyond their max distance. Linear
attenuation doesn't give a proper rolloff, but it makes the sounds silent at
max distance.
13 years ago
a256b9a7b0
Remove a comment about Audiere
13 years ago
3fea3e7d25
Fix stereo files with libsndfile
13 years ago
f7ac94d686
Pass the new position to the sound update method
13 years ago
44fc204864
Avoid passing a sound decoder to the play methods
13 years ago
ddfa906922
Add a missing include
13 years ago
a69ec91242
Remove some unnecessary wrappers and do some small cleanups
13 years ago
a91085a1b9
Add a couple comments
13 years ago
7160d20db3
Be more consistent with the vector orientations given the sound handler
13 years ago
cbeff4657f
Pass the loop and untracked flags when playing a 3d sound
13 years ago
87adf6002a
Fix a copy-paste typo in the openal output
13 years ago
5563f583ff
Add and implement methods to update tracked sounds on an object
13 years ago
979ae89aab
Pass volume and pitch parameters to streamed sounds
13 years ago
cac07d0fbf
Remove some unnecessary methods
13 years ago
e49a090af7
Remove unnecessary hack
13 years ago
d57051375d
Implement non-streaming sounds with OpenAL
13 years ago
9adf1e8461
Keep a handle on played sounds
13 years ago
656863ec6e
Add functions to play sounds
13 years ago
a46f8ced05
Keep the sound output's listener updated with the camera position
13 years ago
2dabdcb9e5
Add a function to update the sound listener
13 years ago
2429755bf1
Make the sound's Play method return void
13 years ago
caf5d71d44
Make the sound decoder's Open method return void
...
Errors are thrown, not returned
13 years ago
1b41987e18
Move OpenAL_SoundStream function definitions out of the class
13 years ago
2f6b73d461
Prevent streamMusic from throwing an exception
13 years ago
207d7dd89e
Stop and delete the current music before deleting the sound output
13 years ago
1ade01edc8
Add a function to stream sounds
13 years ago
9cf42f6d0f
Flesh out the sound decoder a bit more
13 years ago
637617056b
Make a skeleton Sound class
13 years ago
246b0266fb
Remove references to Audiere. It's not supported for now.
13 years ago
46cd84aac5
Add a skeleton ffmpeg decoder
13 years ago
1322b1e160
Move Sound_Output's definition to a separate header
13 years ago
10037e79e7
Add a skeleton decoder class using mpg123 and libsndfile
13 years ago
45b612ab3b
Add a skeleton output classs using OpenAL
13 years ago
42b445383f
Remove Mangle- and OpenEngine-related sound code
...
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
13 years ago
b2c6d52db1
Another file search fix
13 years ago
588ac44bc7
Improved matching for the FileListLocator
13 years ago
f7c7ed0ac7
Fix regression with locating sound files
13 years ago
6dddf8a3d5
Pickup sounds for armors
13 years ago
836732096e
Fix both relative and 3D sounds
13 years ago
6f46f2b7a0
SoundManager: add the ability to play non-3d looping sounds
13 years ago
a309ef7b55
Corrected setPlaylist and added stopMusic
13 years ago
44620ada86
SoundManager: Finish up with Task #172 , plus cleanup
13 years ago
ad6175c78a
SoundManager: Set up the priority for file look up right and take care of a corner case
13 years ago
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
13 years ago
54353794e5
SoundManager: Completely rewrote the file management
13 years ago
03ea3bb62f
SoundManager: first attempt at refactoring. BROKEN
13 years ago
1776ede9e1
Broken sound path fix
13 years ago
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
38c0f36d44
Issue #19 : Finished cleaning out the Engine framelistener
13 years ago
0f2df4e2b8
more cleanup
14 years ago
56affd018a
Some cleanup
14 years ago
2fe66319fe
streammusic strict
14 years ago
9eefee7168
Say strict
14 years ago
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
14 years ago
4dd8616f87
Merge remote branch 'pvdk/master'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwsound/soundmanager.cpp
14 years ago
dd4d022301
Converted all tabs to four spaces
14 years ago
d38f2f0a00
See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound
14 years ago
a9892161af
MP3 functions moved to soundmanager
14 years ago
74aba13053
Music Player
14 years ago
004541f5cf
Tested and applied Chris' sound patch.
15 years ago
93ef530c93
Minor fix on the last commit
15 years ago
11022f1520
Fix crash at shutdown. updater() is still referenced by OGRE after it is deleted, since the SoundImpl is deleted by ~Engine before mRoot is deleted.
15 years ago
978c73add5
fixed sound removal on cell change
15 years ago
2ad9850070
Added .wav -> .mp3 sound file lookup
15 years ago
3127602c57
Added file_finder component. Used by sound system.
15 years ago
104f3fdd50
Added path conversion for say() sounds
15 years ago
064bc4b6c9
Finished sound system
15 years ago
9a5e7816eb
Renabled music. WILL CRASH WITH MPG123 v1.12.1.
15 years ago
65c2070086
Temporarily disabled music
15 years ago
31017447eb
Added --nosound switch
15 years ago
6cdb0f1152
Enabled music streaming
15 years ago
f2b2fe560f
Mangle update: Implemented streaming, fixed various bugs.
15 years ago
08289158d7
Added support for WAV files with libsndfile
15 years ago
dbd42386da
temporary try/catch around sound loading
15 years ago
Chris Robinson
scrawl
greye
Marc Zinnschlag
Dmitry Marakasov
Alexander "Ace" Olofsson
Sylvain THESNIERES
Nikolay Kasyanov
Lukasz Gromanowski
Michael Papageorgiou
Jason Hooks
Pieter van der Kloet
Jan-Peter Nilsson
Jason Hooks
Nicolay Korslund
athile