Commit Graph

53 Commits

Author SHA1 Message Date
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
Torbjörn Andersson
c40a8b48a1 Cleanup.
svn-id: r22569
2006-05-22 07:27:20 +00:00
Torbjörn Andersson
57efbacb9a Palette handling simplification, suggested by LordHoto.
svn-id: r22567
2006-05-21 20:41:53 +00:00
Torbjörn Andersson
a1f5bddaa8 If possible, sync the frame to getSoundElapsedTime().
svn-id: r22566
2006-05-21 20:25:22 +00:00
Torbjörn Andersson
71ba5c0f58 Grotesque hack to support the jung2.vqa movie. Either the VQA is less well
understood than I hoped, or the offset to the first frame of the movie is
completely out to lunch. Scan the file for the first VQFR chunk and use that
offset instead.

svn-id: r22565
2006-05-21 20:08:14 +00:00
Torbjörn Andersson
bda33949e4 The unsupported cutscene is called "jung", not "junk". (It just happens to look
like junk at the moment.)

svn-id: r22564
2006-05-21 19:08:10 +00:00
Torbjörn Andersson
b98a67d1eb More VQA fixes:
* Use setScreenPalette() rather than calling the backend directly. (As an extra
  bonus, the VQA player now only needs to store 3 bytes per colour.)

* Hide the mouse cursor while the movie is playing.

svn-id: r22563
2006-05-21 19:03:27 +00:00
Torbjörn Andersson
9fad465cf6 At LordHoto's request...
* The VQA move player isn't as similar to the WSA movie player as we first
  envisioned, so the VQA player no longer inherits from Movie. It does retain
  a fairly similar calling interface, though.

* Use the Kyra engine's idea of screen dimensions, rather than the backend's.

svn-id: r22561
2006-05-21 18:16:34 +00:00
Torbjörn Andersson
b2d8f804cd Some minor VQA player fixes:
* The playVQA() function now takes the name of the cutscene, rather than the
  filename. This is so that playVQA("FOO") will be able to play FOO0.VQA,
  FOO1.VQA or FOO2.VQA, depending on which movie size is selected.

* The VQA player centers movies by default, so don't set the position to 0,0.

* Ask the backend for screen dimensions (for centering the movie) rather than
  hard-coding them.

svn-id: r22560
2006-05-21 17:28:03 +00:00