Chris Robinson
14e0c182f3
Allow specifying the sound type to playSound and playSound3D
2013-07-18 21:50:11 -07:00
Miroslav Puda
743b3dec99
Correction of libavutil version
2013-06-26 07:17:29 +02:00
eroen
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.
2013-06-24 21:08:28 +02:00
eroen
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.
2013-05-26 12:01:01 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
scrawl
48a88f1917
Fix startRandomTitle
2013-04-04 15:10:27 +02:00
Chris Robinson
35e2b6942a
Merge remote-tracking branch 'zini/master' into misc-cleanup
2013-02-26 10:21:28 -08:00
Chris Robinson
ceafcc2ebb
Support float samples with ffmpeg
...
Requires the AL_EXT_FLOAT32 extension in OpenAL
2013-02-26 10:19:33 -08:00
Nathan Jeffords
21f502e3dd
properly handle potentially non 16 bit planar audio formats
2013-02-26 09:37:18 -08:00
Nathan Jeffords
7ea1f6a02a
fixes for using FFMPEG on windows
2013-02-24 09:42:08 -08:00
Nikolay Kasyanov
0d4b0bfd93
Trying to resolve sound issues on OS X with ffmpeg backend
2013-02-07 23:40:20 +04:00
Chris Robinson
8a073c113e
Use const references where appropriate
2013-01-15 12:07:15 -08:00
Nathan Jeffords
39d27b87c9
fixed build error with Audiere coded enabled
2013-01-08 09:14:56 -08:00
Chris Robinson
1dd9276ceb
Add missing decoder method declarations
2012-12-28 11:26:41 -08:00
Chris Robinson
85850c7440
Fix DEFAULT_OUTPUT declaration
2012-12-18 10:43:04 -08:00
Chris Robinson
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
2012-12-18 06:01:21 -08:00
Chris Robinson
3b7edae7c3
Don't hold a list of all sound sources
2012-12-18 05:19:32 -08:00
Chris Robinson
fe36cc1de7
Don't try to resume sound types that aren't paused
2012-12-18 04:35:24 -08:00
Chris Robinson
2f8daec379
Allow pausing only certain types of sounds
2012-12-18 04:19:35 -08:00
Chris Robinson
b4e36d4f31
Add a method to get the volume from the sound type
2012-12-18 02:01:04 -08:00
Chris Robinson
a5356e194e
Allow specifying a type for the playTrack method
2012-12-18 01:35:20 -08:00
Chris Robinson
72ffceb206
Add type flags to the sound play mode
2012-12-18 00:57:57 -08:00
Chris Robinson
dd3e568a00
Set the sound properties at initialization
2012-12-17 23:35:20 -08:00
Chris Robinson
20321c4552
Keep track of the actual active sounds
2012-12-17 21:50:01 -08:00
Chris Robinson
d348435a1d
Improve audio open error message
2012-12-17 21:09:57 -08:00
Chris Robinson
e9d833be03
Use the packet pts to calculate the decoder sample offset
2012-12-16 01:56:52 -08:00
Chris Robinson
1a771ae671
Merge the stream struct into the parent decoder
2012-12-15 23:46:32 -08:00
Chris Robinson
5fff1c4e47
Update the ffmpeg decoder to use avcodec_decode_audio4
2012-12-15 23:22:37 -08:00
Chris Robinson
5f4c33f896
Only store one packet at a time
2012-12-15 22:54:54 -08:00
Chris Robinson
9d86890d9d
Only use one stream for the ffmpeg decoder
2012-12-15 22:13:19 -08:00
Chris Robinson
32b0a5d96e
Update the queued sample count immediately
2012-12-14 23:42:49 -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
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
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
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
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
c2e1595445
Treat paused sounds as still playing
2012-12-11 21:01:32 -08: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
e3dd3d565c
fix 2 leaks
2012-12-10 00:59:39 +01:00
scrawl
d432420a32
fix FindFFmpeg.cmake
2012-12-01 20:53:28 +01:00
scrawl
5f7d349126
several missing includes
2012-11-14 05:32:23 +01:00
greye
e628b23da6
applying new interface vol.3, inconsistent
2012-11-05 21:45:35 +04:00