scrawl
7a2a7633d5
Fix videoplayer destruction issue that valgrind complained about
2015-05-08 17:11:40 +02:00
scrawl
00f4f78717
Give a name to video streams for logging purposes
2015-05-07 23:08:52 +02:00
scrawl
b0804734e5
Port VideoWidget
2015-05-01 03:03:44 +02:00
scrawl
c53a56ed6e
clear stream errors before attempting the read
2015-04-21 16:10:11 +02:00
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
2015-04-19 20:14:06 +02:00
scrawl
168c0d9b39
Dead code removal
2015-04-19 20:12:37 +02:00
scrawl
42f6d9e15b
Port video player
2015-04-19 20:07:18 +02:00
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
scrawl
5a47b7ae6e
Warning fix
2015-03-06 02:36:12 +01:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
scrawl
fec8cf91f5
Add exception handling to various uses of DataStream::read
2015-01-31 22:40:42 +01:00
scrawl
472165097d
Warning fix
2015-01-27 23:12:21 +01:00
scrawl
60f722b0a9
Treat the first mouse motion event as non-relative
...
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
2015-01-27 23:05:19 +01:00
scrawl
6b2df95167
Fix for some coverity defects
2015-01-15 02:03:27 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
Digmaster
e076e8a9bd
Fixed error when downgrading openmw versions
2014-12-09 14:53:50 -06:00
Digmaster
bb6ed06a4e
read gamecontrollerdb file location from settings file
2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a
Fixed binding controls to A on joystick
2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593
Inital value for joysticks is 0.5
2014-12-09 11:16:17 -06:00
Digmaster
c37881ead1
Joystick Support
2014-12-08 21:57:32 -06:00
scrawl
ad38345de4
Clean up listener in destruction of OgrePlatform ( Fixes #2145 )
2014-11-28 23:15:07 +01:00
scrawl
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
2014-11-01 19:37:54 +01:00
scrawl
dc6a99d32a
Add missing virtual destructor
2014-10-25 20:30:42 +02:00
scrawl
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-25 19:59:23 +02:00
scrawl
6126b3b84a
Videoplayer: wait until we have the first picture before returning from playVideo()
2014-10-25 17:27:25 +02:00
Marc Zinnschlag
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
2014-10-25 12:08:16 +02:00
cc9cii
ea67cf0ebe
Try the fix again.
2014-10-25 15:37:09 +11:00
cc9cii
e01795556f
Suppress some warnings for MSVC.
2014-10-25 10:37:57 +11:00
scrawl
102103e37b
Add possibly missing include for av_rescale_q
2014-10-25 00:14:51 +02:00
scrawl
b39d69e98c
Videoplayer fixes, play/pause & seeking
...
- Fix rindex overflow
- Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
- Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
- Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)
The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
2014-10-24 21:31:11 +02:00
scrawl
2a3627b5a8
avresample wrapper fix
2014-10-23 18:27:00 +02:00
scrawl
a9be8628b9
namespace fix, improve comment
2014-10-22 23:22:22 +02:00
scrawl
9da1c49276
Add missing header to CMakeLists, remove stale comment
2014-10-22 22:41:05 +02:00
scrawl
eb1c24ffe6
Refactor video player engine to get rid of MWSound dependencies
...
- Split video player to separate source files.
- Move video player engine sources to extern/ (repository will be set up on github soon).
- Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
- Handle conversion of unsupported channel layouts via ffmpeg's swresample.
2014-10-22 22:33:32 +02:00
sylar
964e42ab02
fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android
2014-10-11 21:21:23 +04:00
scrawl
f9b6cc468d
Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action ( Fixes #1960 )
2014-10-01 17:54:18 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
319f4e0547
Bind to scancodes instead of keycodes
2014-09-13 20:39:59 +02:00
scrawl
24e5a90bab
Fix crash when input settings contain extra channels
2014-09-03 02:15:58 +02:00
