Commit Graph

713 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
Johannes Schickel
71b4b3dcba - Adapt documentation, that keycolor in setMouseCursor may not exceed the maximum color value of the specified format.
- Change SDL backend to assert out on invalid keycolor values

In case we really need a way to specify "no keycolor" we need to
discuss on how to do it *properly*.

svn-id: r47123
2010-01-07 15:28:58 +00:00
Marcus Comstedt
40f9506163 The default keycolor for mouse pointers used to be 255.
This makes sense as a default for CLUT8 modes, but not really
for anything else.  As part of the gsoc2009-16bit merge, the
default was changed to "all ones", with extra code in the SDL
backend to truncate this to the depth of the mode.  However,
"all ones" (white) still isn't a very useful default for RGB modes.
So rather than jumping through hoops to provide a bad default,
it's better to remove the default altogether.  Engines which relied
on the old default of 255 have been updated to specify it explicitly.

svn-id: r47118
2010-01-07 15:07:36 +00:00
Torbjörn Andersson
9f2b65888a Worked around what appears to be a bad JPEG image in the Masterpiece edition of
Myst. If I dump the image to file, I'm able to read it into other programs,
such as The GIMP, just fine. It seems that the only thing that's missing is the
End Of Image marker, and what everyone else does is to just fake one.

svn-id: r46795
2009-12-31 10:13:59 +00:00
Max Horn
d083e02215 Rename Common::Stream::readLine_NEW to readLine
svn-id: r46779
2009-12-30 23:00:55 +00:00
Fabio Battaglia
3a418c13a7 remove bad hackery caused by n64 port and avoid polluting StdioStream using a custom Stream subclass
svn-id: r46777
2009-12-30 22:56:19 +00:00
Fabio Battaglia
a108df30a7 Add Nintendo 64 port to trunk.
svn-id: r46773
2009-12-30 21:11:38 +00:00
Matthew Hoops
b775c03c29 Use the special Cinepak YUV2RGB function in the Cinepak decoder. This makes the Riven videos match up with the backgrounds better. Thanks, Torbjorn\!
svn-id: r46750
2009-12-30 15:29:52 +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
c453790efc Updated module.mk
svn-id: r46716
2009-12-29 19:44:08 +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
Scott Thomas
b63cbe2577 JPEG tweaks and optimization (thanks to digitall)
svn-id: r46522
2009-12-24 08:26:13 +00:00
Max Horn
6c98169dc3 GUI: Shorten button labels if too long, and improve the shortening logic
svn-id: r46381
2009-12-15 08:19:59 +00:00
Johannes Schickel
6b44a09a52 Hopefully fixing linking on MSVC:
svn-id: r46329
2009-12-10 21:40:38 +00:00
Johannes Schickel
dce1d4aa4b Properly clean up memory when destroying CursorManager.
svn-id: r46325
2009-12-09 23:05:15 +00:00
Johannes Schickel
7605a35fd7 Cleanup: Move constructor/destructor definition of CursorManager::Cursor and CursorManager::Palette to cursorman.cpp.
svn-id: r46324
2009-12-09 23:04:54 +00:00
Johannes Schickel
414e6ffef3 Some more slight cleanup.
svn-id: r46314
2009-12-09 17:09:18 +00:00
Johannes Schickel
0d43cc61d2 Cleanup: remove "s_initialized" from CursorManager and FontManager implementation, these classes are Singletons, so they will ever only be initialized once at most anyway.
svn-id: r46313
2009-12-09 17:05:23 +00:00
Max Horn
626f85ae5e Move findCompatibleFormat from graphics/pixelformat.h to engines/engine.cpp
This function is used in only one place. Declaring it requires common/list.h;
by putting it into pixelformat.h, which is included by common/system.h, tons
of things suddenly included list.h for no good reason.

If we ever need to call this function in other places, we can figure out aborts
more appropriate place for it.

svn-id: r46310
2009-12-09 16:45:35 +00:00
Max Horn
fb5e747565 GRAPHICS: Change font code to be identical on all platforms
svn-id: r46309
2009-12-09 16:44:48 +00:00
Johannes Schickel
421363a132 Slightly modified commit of patch #2911414 "MSVC: conversions warnings in common code".
svn-id: r46308
2009-12-09 16:41:08 +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
746f391b8a Cleanup.
svn-id: r45993
2009-11-19 22:22:08 +00:00
Max Horn
974b49ebfe Put two of the WinCE downscalers into graphics/scaler/downscaler*, so that they can be used by multiple backends (more could be added as needed)
svn-id: r45974
2009-11-18 15:19:44 +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