22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
7a3bc69df7
Readded sound listener
10 years ago
a59940a2c7
Move MyGUI platform to components
10 years ago
8c810e3620
Move rng to components
10 years ago
c53a56ed6e
clear stream errors before attempting the read
10 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
42f6d9e15b
Port video player
10 years ago
8c7c89a4aa
Port SoundManager
10 years ago
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
10 years ago
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
3879ce6ac1
Get rid of "player" string checks ( Fixes #2216 )
10 years ago
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
10 years ago
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
10 years ago
ad8790fba0
Fix setWaterLevel script instruction not affecting physics
10 years ago
fec8cf91f5
Add exception handling to various uses of DataStream::read
10 years ago
855fe33c59
Add vanilla-compatible range limiting for playloopsound ( Fixes #244 , Fixes #1342 )
10 years ago
cf85cbbc8e
Switch sound distance model to AL_INVERSE_DISTANCE
10 years ago
fbed429b25
Use GMSTs for sound fading distance
10 years ago
29c9b6bd01
Merge remote-tracking branch 'scrawl/master'
10 years ago
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
10 years ago
efa4d09c48
Fix crash when avcodec_decode_audio4 doesn't return a full frame ( Fixes #2088 )
10 years ago
8b3d876534
Merge remote-tracking branch 'lgro/ffmpeg_decoder'
10 years ago
ac067564ea
Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware.
10 years ago
55c9c0a266
Audio resampling fixes
...
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
10 years ago
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
10 years ago
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.
10 years ago
eb45793eab
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
10 years ago
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
9edcc332ec
Don't remove player's sounds when unloading a cell
10 years ago
7252cb63a6
Fix cppcheck issues
10 years ago
c72369fafe
Simplified casting when comparing to AV_NOPTS_VALUE.
...
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
7ad6a94523
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian)
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
6987dd768a
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
1107156334
Workaround incorrectly reported channel_layout
10 years ago
675d11c0e5
Mental note: need to get a linux box
10 years ago
8fe6877cb2
More include madness b/w different systems & compilers
10 years ago
de41dfc314
Add includes.
10 years ago
0121fdca2c
Don't use C99 in printf.
10 years ago
be74db8b24
Don't use to_string()
10 years ago
ecd9dd81ea
Moved debug statements before exception..
10 years ago
ce3077c970
Test version with debug statements. Also moved some common code out to a separate file.
10 years ago
48a36442c6
Add libswresample and libavresample support for sounds.
10 years ago
45af34d189
Merge branch 'master' of https://github.com/OpenMW/openmw
11 years ago
a59620f643
Cache loudness vector in the buffer cache
11 years ago
0943ff0886
Fix normalizing sample values
11 years ago
598c0c4ae7
Implement mouth animation for NPCs based on say sound ( Fixes #642 )
11 years ago
b56cb7e5ee
Remove defunct option for building without FFmpeg
...
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
(FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
11 years ago
7b1e1d03d8
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/sky.hpp
11 years ago
09926a86cb
Fix comparing outdated listener position with up-to-date cell ( Fixes #1499 )
11 years ago
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
80f66e2157
Fix crash when avformat_open_input fails ( Fixes #1522 )
11 years ago
be6f1fe4fe
Fix a sign error
11 years ago
d970cc06d7
Don't play the same music track twice in a row ( Fixes #746 )
11 years ago
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
11 years ago
e5a21aca53
Refactor projectiles to no longer use MW-objects
11 years ago
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
11 years ago
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
620a8ccaf3
remove Audiere and MPG123+Sndfile decoder sources
11 years ago
1b8c975d5b
minor performance improvements in apps/openmw
...
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.
For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
11 years ago
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
11 years ago
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
11 years ago
367919200f
moved CellRefList into a separate file
11 years ago
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
11 years ago
736644de05
Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
...
This reverts commit 51fb9f65ea
11 years ago
51fb9f65ea
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
11 years ago
5e8cb2e466
Another attempt to fix #1041 . This time I'm sending real data from decoder
...
once after playback started.
11 years ago
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
11 years ago
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
11 years ago
9ebe66e693
improved cleanup; failed loads will now drop back into the main menu instead of crashing
11 years ago
0f60898517
adding missing cleanup for SoundManager
11 years ago
ba5300b071
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
11 years ago
e410eb5273
Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.
11 years ago
396efd580b
Fix a leftover of the old coordinate system
11 years ago
2196ce427a
Closes #556 : Link movie volume to 'master' volume slider, instead of 'music'.
11 years ago
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
11 years ago
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
11 years ago
a6e6411686
Merge remote-tracking branch 'scrawl/master'
11 years ago
531bef6193
Shorter Vector3 initialisation
11 years ago
2d4e06cd50
Updated comments about freeing format_ctx->pb->buffer.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
6107d5bad2
Updated ffmpeg decoder fix
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
e818d43bc3
removed an outdated typedef and some dead code
11 years ago
f216b25be8
Slightly randomize time between environment sounds
...
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
12 years ago
02df8ab841
Store the underwater sound to easily stop it
12 years ago
16331bf1ed
Avoid a hack to play the underwater sound properly
12 years ago
86020ad94d
Added underwater and drowning sounds.
12 years ago
5cafe65cd7
Merge remote-tracking branch 'scrawl/cppcheck'
12 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
f297c21e4d
Old door sound fades out on door open/close. Door sound is synchronised to angle on action.
12 years ago
90a5d8b6f5
Fix uninitialized AL listener position/orientation when the game is paused during the first frame
12 years ago
f73008546f
Keep a sound updated with its object's position
12 years ago
ad6d663e09
Remove some unnecessary debug messages
12 years ago
14e0c182f3
Allow specifying the sound type to playSound and playSound3D
12 years ago
743b3dec99
Correction of libavutil version
12 years ago
d75391de8e
libav-9 - fix missing includes
...
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
12 years ago
2850032d9e
libc++ fixes: avcodec/avformat workaround
...
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.
Moving the string inclusion after that eyesore shouldn't break anything.
12 years ago
c41f119ba6
Added new game button
12 years ago
48a88f1917
Fix startRandomTitle
12 years ago
35e2b6942a
Merge remote-tracking branch 'zini/master' into misc-cleanup
12 years ago
ceafcc2ebb
Support float samples with ffmpeg
...
Requires the AL_EXT_FLOAT32 extension in OpenAL
12 years ago
21f502e3dd
properly handle potentially non 16 bit planar audio formats
12 years ago
7ea1f6a02a
fixes for using FFMPEG on windows
12 years ago
0d4b0bfd93
Trying to resolve sound issues on OS X with ffmpeg backend
12 years ago
8a073c113e
Use const references where appropriate
12 years ago
39d27b87c9
fixed build error with Audiere coded enabled
12 years ago
1dd9276ceb
Add missing decoder method declarations
12 years ago
85850c7440
Fix DEFAULT_OUTPUT declaration
12 years ago
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
12 years ago
3b7edae7c3
Don't hold a list of all sound sources
12 years ago
fe36cc1de7
Don't try to resume sound types that aren't paused
12 years ago
2f8daec379
Allow pausing only certain types of sounds
12 years ago
b4e36d4f31
Add a method to get the volume from the sound type
12 years ago
a5356e194e
Allow specifying a type for the playTrack method
12 years ago
72ffceb206
Add type flags to the sound play mode
12 years ago
dd3e568a00
Set the sound properties at initialization
12 years ago
20321c4552
Keep track of the actual active sounds
12 years ago
d348435a1d
Improve audio open error message
12 years ago
e9d833be03
Use the packet pts to calculate the decoder sample offset
12 years ago
1a771ae671
Merge the stream struct into the parent decoder
12 years ago
5fff1c4e47
Update the ffmpeg decoder to use avcodec_decode_audio4
12 years ago
5f4c33f896
Only store one packet at a time
12 years ago
9d86890d9d
Only use one stream for the ffmpeg decoder
12 years ago
32b0a5d96e
Update the queued sample count immediately
12 years ago
0a5ab977b7
Use the decoder's sample offset for calculating the stream offset
12 years ago
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.
12 years ago
f067b22b3f
Use a recursive mutex for the OpenAL stream thread
12 years ago
ba9c5f5b4e
Don't initially fill buffers in OpenAL_SoundStream::play
12 years ago
779ced0889
Add a method to play an audio track with a custom decoder
12 years ago
1571243ef0
Implement getTimeOffset for OpenAL_SoundStream
12 years ago
86bf6388c6
Pass a decoder to the playStream sound output method
12 years ago
9c831d3039
Add a decoder method to get the "file" name
12 years ago
34e36fb852
Add a method to get the time offset from sounds
12 years ago
7fd9e1d212
Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
12 years ago
18d8c767bd
fix a bunch of warnings, improved error handling, initialize texture to black
12 years ago
2c1eceb9f0
Add methods to pause and stop all playing sounds (and music)
12 years ago
973b5faf25
Keep track of all allocated sources
12 years ago
c2e1595445
Treat paused sounds as still playing
12 years ago
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
12 years ago
e3dd3d565c
fix 2 leaks
12 years ago
d432420a32
fix FindFFmpeg.cmake
12 years ago
5f7d349126
several missing includes
12 years ago
e628b23da6
applying new interface vol.3, inconsistent
12 years ago
d205723a17
resolving m prefix/ESMStore movement
12 years ago
2057f5619e
move ESMStore to MWWorld
12 years ago
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
12 years ago
1a2034b4dd
training window
12 years ago
35d099a638
disabling gcc extensions
12 years ago
35d7b5e5b0
Merge remote-tracking branch 'greye/record_saving'
12 years ago
6c5c9ce46e
Avoid console spam when a sound can't play
12 years ago
6942fa97da
Specify a proper up vector for the listener
12 years ago
991f942fba
Merge remote-tracking branch 'zini/master' into sound
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.cpp
apps/openmw/mwsound/soundmanagerimp.hpp
12 years ago
7606ebafd6
resolving conflicts, minor update
12 years ago
81463fa23d
Issue #372 : fixed positions in SoundManager
13 years ago
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
13 years ago
b5bc7bc424
SoundManager dependency on camera pos/dir
13 years ago
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
13 years ago
df60f4bf92
stub for soundmanager, adjust rotation mode
13 years ago
ec9cf4d3c6
rotateObject() added, input system rewritten
13 years ago
0e934a52ca
Include soundmanager.hpp for Play_Normal enum
13 years ago
1c53add6c4
Include boost/shared_ptr.hpp for boost:shared_ptr
13 years ago
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
13 years ago
87667ab57e
Issue #107 : Ptr related include cleanup
13 years ago
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
2f8056dfab
Merge remote branch 'zini/master' into sound
13 years ago
0f71439991
Merge remote branch 'garvek/master'
13 years ago
fc3a3fc173
MSVC build compliance:
...
- static const float member is not ISO
- callback do not match DLL signature
13 years ago
c85c794c86
fixed some cppcheck issues
13 years ago
05fd8f0211
Update the actual sounds and music volume when settings change
13 years ago
cbe89f7e32
copy&paste mistake
13 years ago
189b044392
small correction
13 years ago
9b94edd561
audio tab with volume sliders
13 years ago
c9aa0ca1f4
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
13 years ago
1627206d56
Remove an unused method
...
Best not to design something we don't yet know what's needed from it.
13 years ago
144d52cf49
Add voices to the chargen class questions
13 years ago
b3caf82714
Avoid using vector<>::data(), which requires C++11
13 years ago
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
59ccab0b2c
Add sound volume settings
13 years ago
752e89a268
Add a setting to select the sound device name
13 years ago
b8be867e6e
Work around a bug in the Windows OpenAL router
13 years ago
87e8917c4d
Don't try to play sounds when no sound output is initialized
13 years ago
63e0e82049
Implement an Audiere-based decoder
13 years ago
2147210ad7
Don't set an underwater environment when there's no water
13 years ago
9c06bfc8fc
Merge remote branch 'zini/master' into sound
13 years ago
64f792c01d
Fix a value defined at the wrong place
13 years ago
e8e8d3fb1b
Fully reset the music before starting the next track
13 years ago
3a57746ee4
Remove an unneeded volume special-case
13 years ago
4944a29b21
Keep track of the sound pitch
13 years ago
cbf6c0404a
Implement a basic underwater sound environment
13 years ago
575474ff69
Pass the mode flags to the sound output play methods
13 years ago
977e7ac9a3
Remove the Play_Single flag. It's not correct.
13 years ago
ae308b9b5f
Use a set of flags instead of separate booleans
13 years ago
e48d125a84
Only allow one instance of a given tracked soundid
...
The untracked flag should probably be broken up and combined with the loop
boolean into a set of flags.
13 years ago
bfac946878
Finally "fix" --nosound
...
Expect degraded performance with it. Looping sounds are constantly checked to
see if they're playing, and try to play it again when it's not.
13 years ago
7541e08909
Don't reset the sound Output device if init fails
13 years ago
28378c063b
Minor OpenAL_SoundStream cleanups
13 years ago
scrawl
Rohit Nirmal
Marc Zinnschlag
dteviot
Thoronador
Lukasz Gromanowski
cc9cii
bogglez
slothlife
Bret Curtis
Nikolay Kasyanov
Chris Robinson
PLkolek
Miroslav Puda
eroen
Nathan Jeffords
greye
Dmitry Marakasov
Alexander "Ace" Olofsson
Sylvain THESNIERES