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 cab68df2574eec34254640770ca371450b341f42.
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
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
1fb9eef27b
Detach the thread used for frame timing
2012-12-12 22:02:33 -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
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
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
scrawl
3106db0379
commented out debug output
2012-12-03 17:41:38 +01:00
scrawl
bc90c75176
more clean up, video played with correct speed, videos without sound working too (mw_credits.bik)
2012-12-03 17:33:02 +01:00
scrawl
a77d910aaf
audio codec is opened, some cleanup
2012-12-03 16:44:41 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
Mark Siewert
896ab44d1e
- Add some updated files missing from last commit.
...
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
scrawl
064cb80c0a
fix wait dialog fading
2012-11-23 20:48:53 +01:00
scrawl
c8562d8442
toggleCollisionBoxes actually does something useful now
2012-11-20 02:20:54 +01:00
scrawl
f5355e3e92
512x512 map, slightly faster
2012-11-16 22:26:00 +01:00
scrawl
dc67a547b0
global map explored overlay
2012-11-16 19:34:09 +01:00
scrawl
aefde3f5bc
Merge branch 'master' into globalmap
2012-11-15 13:21:24 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
greye
50867e8d87
fix gender selection update, main model visibility and couple of crashes
2012-11-10 19:57:50 +04:00
greye
235b565bb7
update main character model
2012-11-10 11:51:48 +04:00
greye
b1ef0026a9
race selection/inventory preview character model update
2012-11-10 11:41:12 +04:00
greye
c3f0dc0dfb
m prefix for NpcAnimation members
2012-11-08 23:11:43 +04:00
Marc Zinnschlag
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
2012-11-07 19:34:28 +01:00
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +01:00
Marc Zinnschlag
6d5333be05
some code cleanup
2012-11-06 13:08:25 +01:00
greye
e74b2c060d
disable createRecord(), Land constness hack, various fixes with Store<T> interface
2012-11-06 13:14:03 +04:00
greye
932a9dc6f9
applying new interface vol.8, inconsistent
2012-11-06 11:53:00 +04:00
