mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:49:54 +00:00
Code Issues Releases Wiki Activity
28373 commits 38 branches 54 tags 122 MiB
Commit graph

604 commits

Author SHA1 Message Date
Chris Robinson
2c27827e4f Add some comment markers to the OpenAL sound classes 2012-03-19 01:33:33 -07:00
Chris Robinson
e234b90173 Use a loop to find the OpenAL format from the decoder format 2012-03-19 00:49:52 -07:00
Chris Robinson
6a256d3993 Make sure the OpenAL stream list is clear before shutting down 2012-03-19 00:38:56 -07:00
Chris Robinson
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.
 2012-03-18 14:42:19 -07:00
Michael Papageorgiou
d10b18b0f3 Removed a couple of warnings with nosound 2012-03-18 22:50:52 +02:00
Michael Papageorgiou
f567950e25 Fix for the --nosound crash 2012-03-18 22:38:53 +02:00
Chris Robinson
b938fd7b36 Make the sound output init return void 2012-03-18 12:19:54 -07:00
Chris Robinson
1965b5bc79 Rename some Sound class member functions 2012-03-18 12:03:15 -07:00
Chris Robinson
403e51cef3 Move the sample type and channel config enums to MWSound and give use appropriate names for the values 2012-03-18 11:56:54 -07:00
Chris Robinson
efae7dfe83 Rename some sound decoder class member variables and functions 2012-03-18 11:47:15 -07:00
Chris Robinson
9656456d30 Make sure the sound decoders are closed when they're finished with 2012-03-18 11:34:23 -07:00
Chris Robinson
362e254720 Rename some more sound class member variables and functions 2012-03-18 11:30:53 -07:00
Chris Robinson
162642e672 Prefix some SoundManager class member variables 2012-03-18 11:17:45 -07:00
Chris Robinson
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.
 2012-03-18 09:05:38 -07:00
Chris Robinson
a256b9a7b0 Remove a comment about Audiere 2012-03-18 08:42:55 -07:00
Chris Robinson
3fea3e7d25 Fix stereo files with libsndfile 2012-03-17 23:47:12 -07:00
Chris Robinson
f7ac94d686 Pass the new position to the sound update method 2012-03-17 23:41:45 -07:00
Chris Robinson
44fc204864 Avoid passing a sound decoder to the play methods 2012-03-17 23:30:43 -07:00
Chris Robinson
ddfa906922 Add a missing include 2012-03-17 22:45:28 -07:00
Chris Robinson
a69ec91242 Remove some unnecessary wrappers and do some small cleanups 2012-03-17 22:13:57 -07:00
Chris Robinson
a91085a1b9 Add a couple comments 2012-03-17 10:45:11 -07:00
Chris Robinson
7160d20db3 Be more consistent with the vector orientations given the sound handler 2012-03-17 10:36:34 -07:00
Chris Robinson
cbeff4657f Pass the loop and untracked flags when playing a 3d sound 2012-03-17 10:16:22 -07:00
Chris Robinson
87adf6002a Fix a copy-paste typo in the openal output 2012-03-17 09:57:39 -07:00
Chris Robinson
5563f583ff Add and implement methods to update tracked sounds on an object 2012-03-17 09:51:03 -07:00
Chris Robinson
979ae89aab Pass volume and pitch parameters to streamed sounds 2012-03-17 09:37:41 -07:00
Chris Robinson
cac07d0fbf Remove some unnecessary methods 2012-03-17 09:27:31 -07:00
Chris Robinson
e49a090af7 Remove unnecessary hack 2012-03-17 09:16:09 -07:00
Chris Robinson
d57051375d Implement non-streaming sounds with OpenAL 2012-03-17 09:15:47 -07:00
Chris Robinson
9adf1e8461 Keep a handle on played sounds 2012-03-17 08:02:46 -07:00
Chris Robinson
656863ec6e Add functions to play sounds 2012-03-17 06:51:44 -07:00
Chris Robinson
a46f8ced05 Keep the sound output's listener updated with the camera position 2012-03-17 06:18:59 -07:00
Chris Robinson
2dabdcb9e5 Add a function to update the sound listener 2012-03-17 04:22:54 -07:00
Chris Robinson
2429755bf1 Make the sound's Play method return void 2012-03-17 03:20:43 -07:00
Chris Robinson
caf5d71d44 Make the sound decoder's Open method return void 
Errors are thrown, not returned
 2012-03-17 03:18:28 -07:00
Chris Robinson
1b41987e18 Move OpenAL_SoundStream function definitions out of the class 2012-03-17 03:15:07 -07:00
Chris Robinson
2f6b73d461 Prevent streamMusic from throwing an exception 2012-03-17 03:06:35 -07:00
Chris Robinson
207d7dd89e Stop and delete the current music before deleting the sound output 2012-03-17 03:01:51 -07:00
Chris Robinson
1ade01edc8 Add a function to stream sounds 2012-03-17 02:55:08 -07:00
Chris Robinson
9cf42f6d0f Flesh out the sound decoder a bit more 2012-03-17 02:51:46 -07:00
Chris Robinson
637617056b Make a skeleton Sound class 2012-03-17 02:45:18 -07:00
Chris Robinson
246b0266fb Remove references to Audiere. It's not supported for now. 2012-03-17 00:11:59 -07:00
Chris Robinson
46cd84aac5 Add a skeleton ffmpeg decoder 2012-03-16 23:59:21 -07:00
Chris Robinson
1322b1e160 Move Sound_Output's definition to a separate header 2012-03-16 23:40:07 -07:00
Chris Robinson
10037e79e7 Add a skeleton decoder class using mpg123 and libsndfile 2012-03-16 23:18:15 -07:00
Chris Robinson
45b612ab3b Add a skeleton output classs using OpenAL 2012-03-16 22:12:17 -07:00
Chris Robinson
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.
 2012-03-16 17:08:13 -07:00
Michael Papageorgiou
b2c6d52db1 Another file search fix 2012-03-16 09:00:18 +02:00
Michael Papageorgiou
588ac44bc7 Improved matching for the FileListLocator 2012-03-15 17:32:10 +02:00
Michael Papageorgiou
f7c7ed0ac7 Fix regression with locating sound files 2012-03-15 13:56:46 +02:00
Michael Papageorgiou
6dddf8a3d5 Pickup sounds for armors 2012-03-13 18:05:38 +02:00
Michael Papageorgiou
836732096e Fix both relative and 3D sounds 2012-03-13 14:08:32 +02:00
Michael Papageorgiou
6f46f2b7a0 SoundManager: add the ability to play non-3d looping sounds 2012-03-09 18:10:23 +02:00
Michael Papageorgiou
a309ef7b55 Corrected setPlaylist and added stopMusic 2012-03-09 03:56:29 +02:00
Michael Papageorgiou
44620ada86 SoundManager: Finish up with Task #172, plus cleanup 2012-03-09 03:22:16 +02:00
Michael Papageorgiou
ad6175c78a SoundManager: Set up the priority for file look up right and take care of a corner case 2012-03-08 23:06:52 +02:00
Michael Papageorgiou
054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 2012-03-07 17:46:51 +02:00
Michael Papageorgiou
54353794e5 SoundManager: Completely rewrote the file management 2012-03-07 02:20:15 +02:00
Michael Papageorgiou
03ea3bb62f SoundManager: first attempt at refactoring. BROKEN 2012-03-06 01:21:00 +02:00
Michael Papageorgiou
1776ede9e1 Broken sound path fix 2012-03-05 16:06:46 +02:00
Lukasz Gromanowski
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>
 2012-01-29 20:27:03 +01:00
Marc Zinnschlag
38c0f36d44 Issue #19: Finished cleaning out the Engine framelistener 2011-10-09 09:28:36 +02:00
Marc Zinnschlag
0f2df4e2b8 more cleanup 2011-06-15 22:33:31 +02:00
Jason Hooks
56affd018a Some cleanup 2011-06-15 13:09:47 -04:00
Jason Hooks
2fe66319fe streammusic strict 2011-06-12 16:36:18 -04:00
Jason Hooks
9eefee7168 Say strict 2011-06-11 20:01:21 -04:00
Pieter van der Kloet
833a61dd82 Fixed Boost errors with 1.46 caused by the deprecated name file_string() 2011-03-28 17:36:05 +02:00
Marc Zinnschlag
4dd8616f87 Merge remote branch 'pvdk/master' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwsound/soundmanager.cpp
 2011-01-06 09:45:14 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Jan-Peter Nilsson
d38f2f0a00 See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound 2011-01-05 02:12:13 +01:00
Jason Hooks
a9892161af MP3 functions moved to soundmanager 2010-11-11 19:47:26 -05:00
Jason Hooks
74aba13053 Music Player 2010-10-31 12:23:03 -04:00
Nicolay Korslund
004541f5cf Tested and applied Chris' sound patch. 2010-09-14 13:27:20 +02:00
Nicolay Korslund
93ef530c93 Minor fix on the last commit 2010-09-07 19:52:54 +02:00
athile
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. 2010-09-07 15:21:38 +01:00
Marc Zinnschlag
978c73add5 fixed sound removal on cell change 2010-08-20 15:24:05 +02:00
Nicolay Korslund
2ad9850070 Added .wav -> .mp3 sound file lookup 2010-08-20 14:20:05 +02:00
Nicolay Korslund
3127602c57 Added file_finder component. Used by sound system. 2010-08-20 12:56:46 +02:00
Nicolay Korslund
104f3fdd50 Added path conversion for say() sounds 2010-08-20 09:36:34 +02:00
Nicolay Korslund
064bc4b6c9 Finished sound system 2010-08-19 16:05:48 +02:00
Nicolay Korslund
9a5e7816eb Renabled music. WILL CRASH WITH MPG123 v1.12.1. 2010-08-18 14:50:49 +02:00
Nicolay Korslund
65c2070086 Temporarily disabled music 2010-08-18 13:05:31 +02:00
Nicolay Korslund
31017447eb Added --nosound switch 2010-08-18 11:16:15 +02:00
Nicolay Korslund
6cdb0f1152 Enabled music streaming 2010-08-17 13:30:53 +02:00
Nicolay Korslund
f2b2fe560f Mangle update: Implemented streaming, fixed various bugs. 2010-08-17 13:18:37 +02:00
Nicolay Korslund
08289158d7 Added support for WAV files with libsndfile 2010-08-16 17:14:37 +02:00
Nicolay Korslund
dbd42386da temporary try/catch around sound loading 2010-08-14 21:43:25 +02:00
Nicolay Korslund
9875d74abf Implemented 3D sound placement. Sound management / lookup system not 
done yet.
 2010-08-14 21:01:20 +02:00
Marc Zinnschlag
ab1510fd5e fixed previous commit 2010-08-14 09:30:43 +02:00
Marc Zinnschlag
0a8d0fed40 added cell-wide stopSound function 2010-08-14 09:26:00 +02:00
Marc Zinnschlag
1d91ac9d9e sound manager interface enhancement 2010-08-14 07:54:51 +02:00
Nicolay Korslund
912c8b1f2d Added mpg123 file reader 2010-08-13 22:30:22 +02:00
Nicolay Korslund
cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 2010-08-13 17:11:03 +02:00
Nicolay Korslund
7516e4ca53 Added music playing as a test 2010-08-12 17:58:29 +02:00
Nicolay Korslund
8067d62800 Decoupled SoundManager from Interpreter::Context 2010-08-12 16:29:22 +02:00
Nicolay Korslund
34572f0b19 Compiled and linked in sound system (not yet functional) 2010-08-12 16:13:54 +02:00
Marc Zinnschlag
31b4d83fac moved sound extensions from mwsound to mwscript (reduces coupling between openmw components) 2010-07-10 11:48:05 +02:00
Marc Zinnschlag
a61b2c39f0 added scriptrunning/startscript/stopscript; sorted out more case problems 2010-07-04 16:00:32 +02:00
Marc Zinnschlag
5174679864 another bug-fix and missing documentation added 2010-07-03 20:51:21 +02:00
Marc Zinnschlag
5d46fc869c added missing sound script functionality; various script-related bug-fixes 2010-07-03 20:35:59 +02:00
Marc Zinnschlag
eeeb9b09f8 identify LiveCellRefs by ptr instead of render handle 2010-07-03 17:59:30 +02:00
Marc Zinnschlag
d51e6fb7c4 second part of refactoring 2010-07-03 15:41:20 +02:00
Marc Zinnschlag
f8cb4c2502 moved sound manager from world to engine (first step of another round of refactoring) 2010-07-03 15:17:02 +02:00
Marc Zinnschlag
c12752df4d added sound manager skeleton and sound script functions 2010-07-03 15:04:00 +02:00