Roman Melnik
88979577db
Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit)
2012-03-19 21:45:53 +02:00
Chris Robinson
04638516b2
Check for stopped active sounds too and remove them
2012-03-19 12:08:40 -07:00
Roman Melnik
a9759c3f33
Fix bug #192 : Remove the focus from the console when console is closed
...
(set current keyFocusWidget to nullptr)
2012-03-19 21:01:00 +02:00
Marc Zinnschlag
b46a2bfa01
Merge remote branch 'werdanith/journalmessage'
2012-03-19 19:34:28 +01:00
Marc Zinnschlag
f2a47d421b
some cleanup
2012-03-19 19:21:08 +01:00
Michael Papageorgiou
82c4bfbf18
Add a notification when the journal is updated
2012-03-19 20:18:08 +02:00
gugus
d4f3430fc6
fix: topics who should not be displayed are not displayed anymore.
2012-03-19 19:17:20 +01:00
Chris Robinson
6c45d6668b
Cache OpenAL buffers for easy reuse
2012-03-19 10:33:06 -07:00
gugus
2707391535
fix for questions
2012-03-19 18:30:52 +01:00
gugus
11569819db
compilation fix
2012-03-19 18:01:54 +01:00
gugus
ba4d44eb67
fix for questions.
2012-03-19 18:01:41 +01:00
Chris Robinson
91821ccd8c
Add the sound stream to the thread after resetting the mIsFinished flag
2012-03-19 09:08:59 -07:00
Chris Robinson
db46bf39b3
Add a rewind method to the sound decoder
2012-03-19 08:48:25 -07:00
Chris Robinson
afa2cb6de7
Stop trying to read decoded audio once it's finished
2012-03-19 07:51:28 -07:00
Chris Robinson
4f69972a9c
Add a method to stream a sound in 3D
2012-03-19 07:28:03 -07:00
Chris Robinson
ae8218bf03
Allocate OpenAL sources when opening the device
...
This allows sources to be more efficiently retrieved and returned
2012-03-19 07:11:01 -07:00
Chris Robinson
8f9d4ff841
Use 6 125ms buffers for OpenAL streams
2012-03-19 05:29:04 -07:00
Chris Robinson
dc6354b2f9
Add functions to get string names for sample types and channel configs
2012-03-19 02:31:40 -07:00
Chris Robinson
4a0b5b7918
Increase the sound stream thread sleep time to 50ms
2012-03-19 02:19:13 -07:00
Chris Robinson
4698e8c0a2
Make the sound stream thread object per-device
2012-03-19 02:15:08 -07:00
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
Jason Hooks
fe9e6a732c
Some cleanup
2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd
Merge
2012-03-18 21:31:31 -04:00
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-19 00:20:43 +01:00
gugus
1a832a65f6
Changed a lot of things. Topics can now change durring dialogue without bug.
...
Missing: ability to remove keyword
2012-03-19 00:19:58 +01: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
gugus
ff5d4b24fc
journal filter works now
2012-03-18 21:47:43 +01:00
Michael Papageorgiou
f567950e25
Fix for the --nosound crash
2012-03-18 22:38:53 +02:00
Marc Zinnschlag
af39275a63
Merge remote branch 'scrawl/weather'
2012-03-18 21:07:04 +01:00
scrawl
1907e21207
removed preprocessor constants
2012-03-18 20:44:56 +01:00
scrawl
c2329b7027
removed preprocessor constants
2012-03-18 20:32:50 +01: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
gugus
9c85a8c1ce
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-18 19:06:52 +01:00
Marc Zinnschlag
ce2cb709c5
fixed getJournalIndex function
2012-03-18 19:05:35 +01:00
gugus
00d3bc9d23
every filters are check during dialogue now. There is a problem with journal.
2012-03-18 18:58:22 +01:00
gugus
7f2ff6f5f1
removed the TODO
2012-03-18 18:05:28 +01:00
gugus
4afe6dd235
death filter
2012-03-18 18:04:51 +01:00
gugus
48e6a42168
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanager.cpp
2012-03-18 17:59:11 +01:00
gugus
34b33b78d2
better filters
2012-03-18 17:58:14 +01:00
Marc Zinnschlag
76b24d9d1a
fixed a compile error
2012-03-18 17:30:05 +01: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
