Chris Robinson
277597c567
Fix DEFAULT_OUTPUT for OpenAL_Output
2012-03-22 18:44:55 -07:00
Chris Robinson
2e28819243
Avoid trying to play an ambient sound if there's no chance for any to play
2012-03-22 18:39:10 -07:00
scrawl
cf3515a898
it is now possible to drag the minimap with the mouse
2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f
MW_MapView skin
2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47bcbdef17
Merge remote branch 'scrawl/mygui' into mygui
2012-03-22 18:46:21 +01:00
scrawl
d1508f5a59
List -> ListBox
2012-03-22 15:28:06 +01:00
scrawl
560e702973
fixed scroll bars
2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce
fix class name typo
2012-03-22 15:10:29 +01:00
scrawl
161d519206
fixed the dialogue history topic selection
2012-03-22 15:01:37 +01:00
Pieter van der Kloet
73a1b256a8
Changed warning dialog text to be less ambiguous
2012-03-22 12:42:08 +01:00
Pieter van der Kloet
fd4826d06f
Fix for Bug #222 , config is always written to user location now
2012-03-22 12:34:43 +01:00
Marc Zinnschlag
47828f91f0
Issue #217 : added getWeight function to ContainerStore
2012-03-22 09:45:48 +01:00
Chris Robinson
bac6df5563
Avoid leaking an ffmpeg stream
2012-03-21 23:32:24 -07:00
Chris Robinson
15317796bf
Handle the wav -> mp3 extension conversion in the sound output backend
2012-03-21 22:49:40 -07:00
Chris Robinson
f11e3e39a1
Add an enumerate method to the sound output interface
2012-03-21 20:15:01 -07:00
Chris Robinson
366c97c492
Use a separate method to check for finished sounds and update the listener
2012-03-21 19:24:38 -07:00
Chris Robinson
e6fe1c0261
Remove a mostly unneeded wrapper function
2012-03-21 19:08:11 -07:00
Chris Robinson
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.
2012-03-21 18:42:48 -07:00
Chris Robinson
8056a7f20b
Throw an exception when looking up a sound instead of returning an empty string
2012-03-21 18:20:32 -07:00
Chris Robinson
9a139f511f
Avoid redefining SOUND_IN
2012-03-21 15:29:05 -07:00
Chris Robinson
56c3b988cc
Avoid copying the region when looking for a sound to play
2012-03-21 15:19:40 -07:00
Chris Robinson
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
2012-03-21 14:49:29 -07:00
Chris Robinson
6a85ef1229
Set Ogre's data stream to NULL when closing the audio file
2012-03-21 14:46:29 -07:00
Chris Robinson
0d973ac8ff
Use the vector's data field instead of the address of the first element
...
Same thing really, but less convoluted
2012-03-21 14:38:37 -07:00
Chris Robinson
fd8326e958
Better handle some ffmpeg errors
2012-03-21 12:20:36 -07:00
scrawl
9b31b6272f
fixed the mouse cursors and fixed MWAttribute & MWSkill
2012-03-21 16:07:56 +01:00
scrawl
64212c0ee6
replaced all the StaticImage and StaticText in code
2012-03-21 14:54:02 +01:00
scrawl
b0b41a9199
should now compile warning free
2012-03-21 13:48:57 +01:00
scrawl
97ab48993e
more deprecated fixes
2012-03-21 13:32:32 +01:00
scrawl
deeb21a131
switched to the new multi-delegates system
2012-03-21 13:27:08 +01:00
Marc Zinnschlag
3dcfcf46cb
Issue #217 : container change tracking
2012-03-21 12:48:05 +01:00
Marc Zinnschlag
a0ee2954bd
Issue #217 : moved some functino implementations from ptr.hpp to ptr.cpp
2012-03-21 12:29:07 +01:00
Marc Zinnschlag
0adbe258fd
Issue #217 : made Ptr track container; fixed a cmake script bug
2012-03-21 12:20:19 +01:00
Chris Robinson
7b22ee6fd1
Use for_each to clear the ffmpeg stream packets
2012-03-20 21:46:12 -07:00
Chris Robinson
2989a1e06e
Improve ffmpeg failure messages
2012-03-20 18:57:11 -07:00
Chris Robinson
26a441f29a
Add a readAll method to the sound decoder, for potentially more efficient reading
2012-03-20 17:57:28 -07:00
Chris Robinson
deb473b9ae
Implement the ffmpeg decoder
2012-03-20 17:05:19 -07:00
Chris Robinson
9a48002025
Fix compilation of the FFmpeg decoder
2012-03-20 14:13:58 -07:00
Chris Robinson
e48745b68e
Fix streamMusic's path lookup
2012-03-20 12:39:49 -07:00
scrawl
d451d7bb67
compile fixes for mygui 3.2
2012-03-20 20:24:36 +01:00
scrawl
66baf9ec81
Merge branch 'master' into mygui
2012-03-20 20:02:30 +01:00
Chris Robinson
fc27d5cc19
Restore music playback
2012-03-20 11:31:13 -07:00
Chris Robinson
5ae47f783e
Use the sound manager's update to make sure music is still playing
2012-03-20 10:46:10 -07:00
Chris Robinson
0261aac518
Use Ogre's resource group manager to handle sound files
2012-03-20 10:34:36 -07:00
Chris Robinson
80dbf82a74
Explicitly stop sounds instead of relying on their deletion to do it
2012-03-20 07:22:17 -07:00
Chris Robinson
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
2012-03-20 06:17:02 -07:00
Marc Zinnschlag
1023ddd587
silenced some warnings
2012-03-20 10:30:21 +01:00
Marc Zinnschlag
4d0d941c2e
Merge remote branch 'kromgart/master'
2012-03-20 10:17:35 +01:00
Marc Zinnschlag
2d135d81e7
Merge remote branch 'lgro/glibc_pthreads_fix'
2012-03-20 10:15:47 +01:00
Marc Zinnschlag
6a0474a977
removed some cout spam
2012-03-20 10:15:22 +01:00
Marc Zinnschlag
aca274cbca
Merge remote branch 'gus/DialogueSystem'
2012-03-20 10:11:40 +01:00
Marc Zinnschlag
ef711ffdc1
Merge remote branch 'scrawl/weather'
2012-03-20 10:08:43 +01:00
Pieter van der Kloet
0b517d15c1
Made missing data files dialog less scary and added exception handling for esmreader
2012-03-20 02:49:59 +01:00
scrawl
04c6f23a2b
disabled solstheim weather (we can't travel there anyway)
...
also, there was a bug that could cause this weather to show up on
morrowind, which is fixed now
2012-03-19 22:54:04 +01:00
Chris Robinson
fd37a4827c
Enforce a 15MB limit on the sound buffer cache
2012-03-19 13:19:22 -07:00
Lukasz Gromanowski
fc95917253
Fix for not visible pthreads function with glibc 2.15
...
Linking error will appear:
Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-03-19 20:54:30 +01:00
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
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
