Commit Graph

108 Commits

Author SHA1 Message Date
Torbjörn Andersson
4818467908 Silenced some more cppcheck warnings. Some of these may seem silly, but the way
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.

svn-id: r47443
2010-01-22 19:05:02 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn
a44c6e4323 Add Mixer::getElapsedTime() method returning a Timestamp, thus offering a higher precision than Mixer::getSoundElapsedTime(). Convert some video code to use it.
svn-id: r47213
2010-01-09 22:37:10 +00:00
Sven Hesse
30e360f5c5 Yup, not checking for stereo sound was an accident here
svn-id: r47195
2010-01-09 03:55:09 +00:00
Max Horn
0cf53b025d Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
2010-01-08 22:07:35 +00:00
Max Horn
474d49946f Rename QueuedAudioStream to QueuingAudioStream
svn-id: r47179
2010-01-08 22:06:04 +00:00
Max Horn
7efba85064 Switch Tinsel, MADE and some of the video players to QueuedAudioStream
svn-id: r47178
2010-01-08 22:05:12 +00:00
Filippos Karapetis
bcc33871c1 The wrapper for the VMD decoder is only used in the SCI engine for SCI32 games, so moved it inside the engine, instead of common code. Added support for VMD video playing from the "play_video" console command
svn-id: r46737
2009-12-30 10:09:48 +00:00
Eugene Sandulenko
5f1d2a88b5 Fix warning
svn-id: r46726
2009-12-29 23:13:30 +00:00
Filippos Karapetis
14d4b75afb Added a thin wrapper around the VMD player class, so that it can be used with the common VideoPlayer interface, to be used with videos from SCI32 games
svn-id: r46715
2009-12-29 19:42:26 +00:00
Sven Hesse
10e62ea992 Adding a getFrameWaitTime() method to get the frame waiting time instead of directly waiting
svn-id: r46712
2009-12-29 18:07:06 +00:00
Sven Hesse
881b831074 Adding CoktelVideo::hasExtraData(void), for checking if /any/ extra data files are embedded in the video file
svn-id: r46710
2009-12-29 17:10:14 +00:00
Sven Hesse
4a189842bb Adding support for mono signed 16bit little-endian uncompressed PCM audio (thank you, clone :))
svn-id: r46270
2009-12-06 04:38:20 +00:00
Sven Hesse
c7305331ee Only print sound information if there actually is sound (preventing a division by 0 exception)
svn-id: r46210
2009-11-30 02:00:42 +00:00
Sven Hesse
8ede0caf72 Properly clear the chunk headers again on closing
svn-id: r46209
2009-11-30 01:58:15 +00:00
Sven Hesse
68b99f1c95 Adding a parameter to the AviDecoder constructor to allow changing the SoundType (instead of it being fixed to Plain)
svn-id: r46170
2009-11-28 00:38:18 +00:00
Sven Hesse
07d8f1c89b Fixing a valgrind warning by memsetting _palette
svn-id: r46169
2009-11-28 00:32:16 +00:00
Sven Hesse
447711b597 Fixing an invalid read in the destructor
svn-id: r46164
2009-11-27 20:28:37 +00:00
Sven Hesse
c8b8ab679f 00AM is another compressed frame type, fixing this (thanks to digitall for figuring that out :D)
svn-id: r46163
2009-11-27 19:26:20 +00:00
Sven Hesse
cb2cc67b41 Extended the AviDecoder a bit
svn-id: r46162
2009-11-27 18:25:40 +00:00
Filippos Karapetis
9a39135758 Typo
svn-id: r46135
2009-11-25 08:07:20 +00:00
Max Horn
0d9609f7f9 Fix incorrectly placed doxygen comments; replace Common::ID2string by Common::tag2string
svn-id: r46127
2009-11-24 22:08:34 +00:00
Johannes Schickel
22e94ddd61 Add missing ")" in #if check.
svn-id: r45834
2009-11-11 14:28:07 +00:00
Max Horn
c3905f60ee Move definition of stdint types to the only file that needs them (mpeg_player.h)
svn-id: r45820
2009-11-10 22:18:41 +00:00
Max Horn
2bbf708dea Introduced new type Common::DisposeAfterUse::Flag
svn-id: r45233
2009-10-18 19:41:59 +00:00
Matthew Hoops
620fa7c641 Override getAudioLag() in the AviDecoder (blatantly borrowed from the SmackerDecoder).
svn-id: r45172
2009-10-16 18:32:20 +00:00
Matthew Hoops
b43e99566e Converting AVIPlayer into a class that inherits from VideoDecoder and adapt SCI to use this. Also, moving the codec and Codec class into their own folder. (Based on a patch by md5)
svn-id: r45170
2009-10-16 18:05:56 +00:00
Filippos Karapetis
422b732dba Added a new convenience method to the video player, which adds the event of skipping videos with the escape key by default, thereby simplifying the video playing code in all places where it's used
svn-id: r45151
2009-10-16 07:42:23 +00:00
Arnaud Boutonné
c93c9cb68d gob: fix a regression in Bargon Attack intro caused by a fix of Ween problems. Still requires a more proper fix, but at least it doesn't hang anymore (closing bug #2878717)
svn-id: r45080
2009-10-14 14:06:53 +00:00
Max Horn
8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)
svn-id: r44495
2009-09-30 16:16:53 +00:00
Max Horn
f73c556146 Fix what looks like a typo bug in the AVI player
svn-id: r44016
2009-09-08 22:03:28 +00:00
Sven Hesse
21163f5ae1 Add some more drawing constraints, so prevent overflowing the video memory
svn-id: r43902
2009-09-01 21:53:00 +00:00
Matthew Hoops
0cd8599082 Rename the WAVE_* constants to AVI_WAVE_* to fix compile on WinCE.
svn-id: r43839
2009-08-30 21:04:20 +00:00
Filippos Karapetis
32ff93bdc7 Named some unnamed enums. Hopefully, this will fix compilation under WinCE.
svn-id: r43836
2009-08-30 20:41:17 +00:00
Matthew Hoops
d8e93836c5 Add an AVI player and MSVideo1 codec for use with some SCI Windows game (such as kq6).
svn-id: r43833
2009-08-30 19:47:14 +00:00
Eugene Sandulenko
5f8fafcc13 Patch #2836424: "Optional compilation of CoktelVideo and Indeo3"
svn-id: r43807
2009-08-29 19:48:01 +00:00
Sven Hesse
e673bd5b95 Fixing some problems when calling the player with muted output
svn-id: r43643
2009-08-22 13:11:55 +00:00
Sven Hesse
1471f0e3dd When ESCing videos, seek to the last frame that was meant to be played. Fixes graphical glitches (bug #2830985) and crashes (bug #2830988)
svn-id: r42995
2009-08-02 10:40:27 +00:00
Sven Hesse
5213cf9aa2 Adding a SoundType parameter to SmackerDecoder, defaulting to kSFXSoundType
svn-id: r42887
2009-07-29 10:17:44 +00:00
Sven Hesse
f5e9aa67c4 Changing stuff around a bit so alignment requirements won't increase
svn-id: r42857
2009-07-28 15:19:55 +00:00
Sven Hesse
14114bf397 Abstracting off the block types from Imd::renderFrame() and Vmd::renderFrame()
svn-id: r42851
2009-07-27 19:01:17 +00:00
Sven Hesse
997f7b9a3b Reverting my fix for bug #2037158 ("In-Game animation shifted(?)"), because it breaks Woodruff's intro
svn-id: r42809
2009-07-26 13:50:18 +00:00
Sven Hesse
32d74a2247 Adding more sanity checks to Vmd::renderFrame()
svn-id: r42783
2009-07-25 18:44:24 +00:00
Sven Hesse
8d9e3de37c Adding support for (new-style) stereo in DPCM audio
svn-id: r42782
2009-07-25 18:44:06 +00:00
Sven Hesse
6de1975b65 Fixing Woodruff videos again after enabling block type 2 transparency
svn-id: r42768
2009-07-25 16:09:19 +00:00
Sven Hesse
3668895abc CoktelVideo cleanup: Splitting up some IMD methods and removing the obsolete notifyPaused()
svn-id: r42715
2009-07-24 21:36:42 +00:00
Sven Hesse
54b63ac239 Moving all implementations into the cpp
svn-id: r42714
2009-07-24 21:36:16 +00:00
Sven Hesse
c4baedc6db Renaming getAnchor() to getFrameCoords()
svn-id: r42713
2009-07-24 21:35:57 +00:00
Sven Hesse
8396e20713 Fixing bytes per pixel detection
svn-id: r42712
2009-07-24 21:35:06 +00:00