libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,575 Commits 5 Branches 5 Tags 1.8 GiB
72163a233f
Commit Graph

61 Commits

Author SHA1 Message Date
Johannes Schickel
b79c2156d0 KYRA: Make GPL headers consistent in themselves. 2014-02-18 02:39:35 +01:00
Johannes Schickel
fd312ddfe3 KYRA: Slight formatting fix. 2014-01-18 03:27:57 +01:00
Torbjörn Andersson
18ef3ed6b3 KYRA: Make pointers to VQAHeader const 
This is just to enforce the idea that VQADecoder owns the VQAHeader
and that the audio/video tracks are only allowed to look at it, not
change it.
 2014-01-18 03:18:40 +01:00
Torbjörn Andersson
16d36224e2 KYRA: Restructure the VQA decoder, as suggested by clone2727 
Untangled the audio and video track from each other, and the parsing
of the stream from the decoding of its data. Also fixed a memory leak
as it turns out deleting a Surface doesn't free its data. You have to
call free() in it.

I have only checked the intro, not every cutscene, but that seems to
work fine at least.
 2014-01-18 03:18:40 +01:00
Torbjörn Andersson
238aa2be2a KYRA: Let the VQA decoder draw directly to the backend 
As an alternative to using the Screen class's functions, we can let
the VQA decoder draw directly to the backend. This won't work if the
game uses "hi-res mode", but I don't think that's ever the case for
Malcolm's Revenge. I believe the KyraEngine_MR::playVQA() function
ensures that the screen is properly updated after the movie has
finished.

This almost limits the VQA rewrite to vqa.cpp and vqa.h. Whether it's
better this way than changing the Screen functions to take a 'pitch'
parameter...? I don't know. But it's an alternative.
 2014-01-18 03:18:40 +01:00
Torbjörn Andersson
19cb3499f5 KYRA: Rewrite the VQA decoder, using the VideoDecoder classes 
There isn't really a lot of benefit to this, but I think it's nicer
if all our video decoders at least try to use the same infrastructure.
 2014-01-18 03:18:40 +01:00
Johannes Schickel
8d5b4b75d4 KYRA: Make all hex constants use uppercase letters. 
Done with:
git ls-files "*.cpp" *".h" | xargs sed -i -e 's/0x\([0-9a-f]*\)/0x\U\1/g'
 2013-01-09 06:01:28 +01:00
Christoph Mallon
75efdd2d84 JANITORIAL: Replace (x ? false : true) by !(x). 2012-03-13 15:43:36 +01:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG 
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
 2011-04-12 16:53:15 +02:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
David Turner
450dac35c7 KYRA: Fix Valgrind Uninitialized Memory Read at end of VQA Playback. 
svn-id: r55619
 2011-01-29 18:20:38 +00:00
Johannes Schickel
6da04bc13b KYRA: Implement support for selecting the VQA quality via "video_quality". 
svn-id: r51187
 2010-07-23 00:39:23 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/ 
svn-id: r47579
 2010-01-26 22:48:45 +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
be8371fb07 Replace AppendableAudioStream by QueuingAudioStream 
svn-id: r47189
 2010-01-09 00:19:13 +00:00
Johannes Schickel
a30b8f0bdc - Fix some missing initialization warnings from cppcheck 
- Fix two invalid memory accesses reported by cppcheck

svn-id: r45414
 2009-10-26 20:07:37 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency 
svn-id: r44634
 2009-10-04 21:26:33 +00:00
Johannes Schickel
b21dd2cb43 Cleanup VQA player a bit. 
svn-id: r41879
 2009-06-25 19:55:25 +00:00
Johannes Schickel
73ea378dee - Changed the following Screen functions to take a reference to a Palette object: 
-> setScreenPalette
	-> fadePalette
	-> getFadeParams
	-> fadePalStep
- Fixed initialization of 256 color palettes

svn-id: r41743
 2009-06-22 02:36:54 +00:00
Johannes Schickel
882662977f Changed Screen::getPalette to return a reference to a Palette object. 
svn-id: r41741
 2009-06-22 02:35:45 +00:00
Johannes Schickel
9da52cb282 Got rid of Screen::_currentPalette. 
svn-id: r41740
 2009-06-22 02:35:04 +00:00
Johannes Schickel
7c5d739ba7 Cleanup. 
svn-id: r41519
 2009-06-14 14:24:28 +00:00
Johannes Schickel
c7ee0a7ec8 More formatting. 
svn-id: r40994
 2009-05-29 13:09:26 +00:00
Johannes Schickel
7561bd9dfb Remov lots of superfluous debug output. 
svn-id: r40715
 2009-05-19 01:13:29 +00:00
Max Horn
2d866c0483 Renamed Kyra's Resource::getFileStream to createReadStream 
svn-id: r36022
 2009-01-23 04:57:18 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces. 
svn-id: r35648
 2009-01-01 15:06:43 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings) 
svn-id: r34514
 2008-09-13 16:51:46 +00:00
Johannes Schickel
bd10e674a3 Got rid of all Common::File usages in Kyra. 
svn-id: r34435
 2008-09-07 22:30:34 +00:00
Max Horn
6bfa3e274a Got rid of File::eof() 
svn-id: r34396
 2008-09-06 21:23:08 +00:00
Christopher Page
7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed 
svn-id: r33082
 2008-07-16 04:22:56 +00:00
Christopher Page
30b1a62e81 Removed unnecessary #inlcudes 
svn-id: r32984
 2008-07-10 05:15:19 +00:00
Christopher Page
b97f39019c KYRA works with the new GMM implementation 
svn-id: r32957
 2008-07-08 05:02:45 +00:00
Johannes Schickel
8f0703abd2 - Fixed sound channel fadeout on VQA playing 
- Minor formatting fixes

svn-id: r32152
 2008-05-17 15:12:20 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1 
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
 2008-05-11 23:16:50 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete []. 
svn-id: r31925
 2008-05-07 14:20:37 +00:00
Johannes Schickel
6dcbc00b23 debug(C) parameter type fixes. 
svn-id: r29864
 2007-12-15 21:20:56 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again 
svn-id: r26180
 2007-03-17 19:02:05 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent 
svn-id: r26156
 2007-03-17 00:53:21 +00:00
Torbjörn Andersson
61e2a9eb78 Clarified some comments and moved some asserts to hopefully answer Fingolfin's 
question why we always created a mono audio stream. There are other games that
use more advanced versions of the VQA format, but it seems unlikely that
ScummVM will ever support any of them.

svn-id: r25911
 2007-02-28 18:25:42 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible) 
svn-id: r25909
 2007-02-28 14:48:26 +00:00
Torbjörn Andersson
809a3bc293 Applied cyx's patch #1659302 ("KYRA: VQA player code cleanup/reduce") with the 
minimal change suggested in the tracker.

svn-id: r25649
 2007-02-17 07:49:12 +00:00
Johannes Schickel
e139d26be1 Replaces malloc with new in most cases. 
svn-id: r23881
 2006-09-16 12:12:02 +00:00
Torbjörn Andersson
066aa14f97 It's play(), not open(), that encounters the CMDS tag. At least in the intro 
movie, which is the only one we currently play.

svn-id: r23626
 2006-07-30 09:10:54 +00:00
Oystein Eftevaag
3c4b13ed33 Moves the kyra2 code to kyra2.cpp and kyra2.h, renames WSAMovieV3 to WSAMovie2 (kyra2 uses the same format), renames a define in kyra3.h for consistency, and adds a case for CMDS in the VQA player to avoid the constant warning (the tag is always present and empty). Credit/blame for the last one goes to Clemmy :). Starting kyra2 will now show the title animation. 
svn-id: r23614
 2006-07-28 11:42:53 +00:00