Chris Robinson
|
c2b711d195
|
Move some more methods to the class they're part of
|
2012-12-14 02:36:29 -08:00 |
|
Chris Robinson
|
26a09ee7ba
|
Move some methods into their respective class
|
2012-12-14 01:38:00 -08:00 |
|
Chris Robinson
|
5221298a7f
|
Move a couple packet queue methods into the struct
|
2012-12-14 01:14:14 -08:00 |
|
Chris Robinson
|
90294c589b
|
Use a volatile bool for the refresh
|
2012-12-13 18:24:57 -08:00 |
|
Chris Robinson
|
f555dc60eb
|
Reduce some indentation
|
2012-12-13 18:12:17 -08:00 |
|
Chris Robinson
|
6cedd64509
|
Fix audio sync correction sizes
|
2012-12-13 18:05:27 -08:00 |
|
Chris Robinson
|
e291d0943d
|
Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback
|
2012-12-13 17:53:50 -08:00 |
|
Chris Robinson
|
606fb982a8
|
Update to use avcodec_decode_audio4
|
2012-12-13 17:53:22 -08:00 |
|
scrawl
|
82564e07c7
|
fix crash when video file doesn't exist
|
2012-12-14 01:44:00 +01:00 |
|
scrawl
|
27cd9ff732
|
Revert "Use the decoded frame pts when available"
This reverts commit cab68df257 .
|
2012-12-14 01:03:49 +01:00 |
|
scrawl
|
9d6f656822
|
fixed ogre resource functions
|
2012-12-14 00:10:54 +01:00 |
|
Chris Robinson
|
43481ad117
|
Use the external clock by default
|
2012-12-13 06:11:32 -08:00 |
|
Chris Robinson
|
0a5ab977b7
|
Use the decoder's sample offset for calculating the stream offset
|
2012-12-13 05:04:53 -08:00 |
|
Chris Robinson
|
cab68df257
|
Use the decoded frame pts when available
|
2012-12-13 04:25:41 -08:00 |
|
Chris Robinson
|
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.
|
2012-12-13 04:10:19 -08:00 |
|
Chris Robinson
|
600494eed8
|
More cleanup of unused code
|
2012-12-13 03:37:04 -08:00 |
|
Chris Robinson
|
f7ff8b3374
|
A bit more cleanup
|
2012-12-13 03:13:44 -08:00 |
|
Chris Robinson
|
7e8b844b2e
|
Clean up some unused code
|
2012-12-13 03:05:37 -08:00 |
|
Chris Robinson
|
d2fbae9760
|
Init and deinit the VideoState synchronously, and re-enable audio playback
|
2012-12-13 02:52:37 -08:00 |
|
Chris Robinson
|
f067b22b3f
|
Use a recursive mutex for the OpenAL stream thread
|
2012-12-13 02:33:35 -08:00 |
|
Chris Robinson
|
ba9c5f5b4e
|
Don't initially fill buffers in OpenAL_SoundStream::play
|
2012-12-13 02:32:21 -08:00 |
|
Chris Robinson
|
1ffaf6625a
|
Remove SDL for playing movie audio and prepare for using an audio track
This breaks audio playback on movies
|
2012-12-13 01:42:20 -08:00 |
|
Chris Robinson
|
779ced0889
|
Add a method to play an audio track with a custom decoder
|
2012-12-13 00:05:57 -08:00 |
|
Chris Robinson
|
1571243ef0
|
Implement getTimeOffset for OpenAL_SoundStream
|
2012-12-12 23:16:45 -08:00 |
|
Chris Robinson
|
86bf6388c6
|
Pass a decoder to the playStream sound output method
|
2012-12-12 22:32:02 -08:00 |
|
Chris Robinson
|
9c831d3039
|
Add a decoder method to get the "file" name
|
2012-12-12 22:19:44 -08:00 |
|
Chris Robinson
|
1fb9eef27b
|
Detach the thread used for frame timing
|
2012-12-12 22:02:33 -08:00 |
|
Chris Robinson
|
34e36fb852
|
Add a method to get the time offset from sounds
|
2012-12-12 16:50:35 -08:00 |
|
scrawl
|
7fd9e1d212
|
Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
|
2012-12-12 22:24:38 +01:00 |
|
scrawl
|
18d8c767bd
|
fix a bunch of warnings, improved error handling, initialize texture to black
|
2012-12-12 15:15:55 +01:00 |
|
Chris Robinson
|
2c1eceb9f0
|
Add methods to pause and stop all playing sounds (and music)
|
2012-12-12 02:33:12 -08:00 |
|
Chris Robinson
|
973b5faf25
|
Keep track of all allocated sources
|
2012-12-12 01:32:16 -08:00 |
|
Chris Robinson
|
e82c4afd50
|
close SDL when closing the video, not after the video loop is finished
|
2012-12-12 00:36:52 -08:00 |
|
Chris Robinson
|
a62d5bbfe4
|
Sleep using the absolute time, so the thread creation doesn't add to the wait
|
2012-12-11 23:54:41 -08:00 |
|
Chris Robinson
|
c2e1595445
|
Treat paused sounds as still playing
|
2012-12-11 21:01:32 -08:00 |
|
Chris Robinson
|
2efdafecd9
|
Indentation fixes
|
2012-12-11 20:11:48 -08:00 |
|
Chris Robinson
|
277248cdcb
|
Fix some "comparison between signed and unsigned" warnings
|
2012-12-11 19:43:07 -08:00 |
|
Chris Robinson
|
3519934f27
|
Add a missing return value
|
2012-12-11 19:36:04 -08:00 |
|
Chris Robinson
|
9e2d4f8b7c
|
Avoid potential NULL dereference
|
2012-12-11 19:32:10 -08:00 |
|
scrawl
|
fe384a1600
|
pause 3d rendering while the video plays
|
2012-12-12 01:30:34 +01:00 |
|
scrawl
|
faad64b254
|
Esc cancels the video
|
2012-12-12 01:13:53 +01:00 |
|
scrawl
|
0ce5ade6d8
|
DataStreamPtr fix, indentation fixes
|
2012-12-11 23:06:06 +01:00 |
|
scrawl
|
c49966dd29
|
started over
|
2012-12-11 22:49:31 +01:00 |
|
scrawl
|
5f676f9c6b
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
|
2012-12-11 22:28:23 +01:00 |
|
Marc Zinnschlag
|
f72d5022fc
|
Merge remote-tracking branch 'scrawl/master'
|
2012-12-10 13:01:14 +01:00 |
|
scrawl
|
44010974fc
|
workaround for HLSL error X4579
|
2012-12-10 12:34:28 +01:00 |
|
Marc Zinnschlag
|
2e8394b645
|
Merge remote-tracking branch 'psi29a/staticboost'
|
2012-12-10 11:05:22 +01:00 |
|
Marc Zinnschlag
|
de4a03081c
|
fixed skill level type in skill level up message
|
2012-12-10 11:04:21 +01:00 |
|
psi29a
|
4114e823ac
|
Allow the ability to choose to compile against boost libs statically.
|
2012-12-10 10:32:00 +01:00 |
|
scrawl
|
e3dd3d565c
|
fix 2 leaks
|
2012-12-10 00:59:39 +01:00 |
|