libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,106 Commits 5 Branches 5 Tags 1.8 GiB
7d743c9e77
Commit Graph

98 Commits

Author SHA1 Message Date
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces. 
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
 2012-09-26 04:17:55 +02:00
Matthew Hoops
18823198ad VIDEO: Merge AdvancedVideoDecoder into VideoDecoder 2012-08-16 14:00:14 -04:00
Matthew Hoops
fb35c7f46f VIDEO: Remove setSystemPalette() 2012-08-16 13:30:32 -04:00
Matthew Hoops
3117e4a8ff VIDEO: Convert DXADecoder to the AdvancedVideoDecoder API 2012-07-24 13:24:01 -04:00
Matthew Hoops
a652f6669e VIDEO: Rewrite SmackerDecoder to use the new API 2012-07-23 21:04:51 -04:00
Matthew Hoops
24c97b8913 VIDEO: Move PSXStreamDecoder to the new VideoDecoder API 2012-07-21 17:31:00 -04:00
Johannes Schickel
d8aff72402 SWORD1: Get rid of casts on OSystem::copyRectToScreen calls. 2012-06-16 02:39:00 +02:00
Matthew Hoops
9e330174c8 VIDEO: Change getElapsedTime() into getTime() 
This name change accompanies a slight meaning change; now it means the current time position from the beginning of the video and not from starting the video.
 2012-05-12 21:28:13 -04:00
Willem Jan Palenstijn
4637d55337 Merge pull request #171 from clone2727/psx-stream-2 
This is a manual merge based on clone2727's merge of his branch
with the sword1 subtitle changes on master.
 2012-02-23 22:49:59 +01:00
Matthew Hoops
7a3e0ea453 SWORD1: Add some TODO's for PSX stream subtitles 
And some other minor cleanup
 2012-02-23 22:48:19 +01:00
Matthew Hoops
a352c3cc00 SWORD1: Add support for the PSX demo videos 2012-02-23 22:48:18 +01:00
Matthew Hoops
66cd8bdd68 VIDEO: Make PSX streams calculate frame timing solely from CD speed 
BS2 videos now play at the proper rate and BS1 videos have improved a/v sync.
 2012-02-23 22:48:18 +01:00
Matthew Hoops
df21e72fe2 SWORD1: Add support for PSX stream playback 2012-02-23 22:48:17 +01:00
Max Horn
4f8665fc83 COMMON: Move isFoo functions to namespace Common, add doxygen comments 2012-02-20 16:18:27 +01:00
Max Horn
658080deed ALL: Avoid using is* macros from ctype.h 
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
 2012-02-15 16:51:37 +01:00
Filippos Karapetis
51ef8a78cc SWORD1: Silence some MSVC warnings (conversion from double to float) 2012-02-13 02:30:05 +02:00
Thierry Crozat
4546ca0e22 SWORD1: Do not look for color indexes in cutscenes when there is no subtitles 2012-01-18 02:44:02 +00:00
Thierry Crozat
ace3bf6187 SWORD1: Use color for subtitles during cutscene 
During the game, different colors are used for subtitles depending
which character is speaking. This commit tries to use the same colors
for the cutscene subtitles. The color to use has to be specified in the
subtitle file between the frame end and the start of text using @1, @2,
@3 or @4 (for George, George as a narrator, Nicole and Maguire
respectively).
 2012-01-18 02:44:02 +00:00
Thierry Crozat
6abd63b804 SWORD1: Fix crash when using cutscene subtitles with mac version 
It might have been simpler to add a bool to Text::makeTextSprite() to
tell it to not byteswap the frame size when called from the movie
player but I was not sure it was a good idea to have frames with
different endianness stored in Text depending where they came from.
 2011-10-27 21:49:33 +01:00
Johannes Schickel
3a15c10241 SWORD1: Made some static data const. 2011-09-08 00:05:09 +02:00
Littleboy
b694a78f62 ANALYSIS: Add static casts to is* functions 
This fixes a potential problem with passing char values that would be sign-extended and yield unexpected results.
See http://msdn.microsoft.com/en-us/library/ms245348.aspx
 2011-06-23 08:52:52 -04:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces 
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
 2011-06-20 00:59:48 +02:00
Thierry Crozat
06bbb57ad7 I18N: Make many more GUI MessageDialog strings translatable 2011-06-13 22:19:18 +01:00
D G Turner
24ac81ead8 SWORD1: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-06-02 04:21:48 +01:00
Max Horn
d84ae94b54 SWORD1: Const correctness, code cleanup & simplification 2011-05-17 15:05:20 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code 
Some backends may break as I only compiled SDL
 2011-04-28 15:08:58 +03:00
Johannes Schickel
83f66284a7 SWORD1: Adapt to setPalette RGBA->RGB change. 2011-02-15 22:16:48 +01:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Max Horn
805a5b2996 VIDEO: In overloaded methods, invoke correct parent implementation 
This should not cause any code behavior changes at this time, but if any
of the intermediate VideoDecoder classes ever starts to overload stuff,
this would become important.

svn-id: r55841
 2011-02-09 00:12:58 +00:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager 
svn-id: r55806
 2011-02-07 17:52:38 +00:00
Eugene Sandulenko
caa6684752 VIDEO: Move video classes to Video:: namespace 
svn-id: r55479
 2011-01-23 19:08:09 +00:00
Matthew Hoops
1ead0d8436 VIDEO: Make VideoDecoder::getPalette() return a const byte pointer 
svn-id: r54928
 2010-12-16 01:41:11 +00:00
Matthew Hoops
375f32fbe9 VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer 
svn-id: r54927
 2010-12-16 01:35:13 +00:00
Torbjörn Andersson
1b294306dd Another video player regression: When the palette changes, look up the 
lightest/darkest available colours to use as white/black for the subtitles. It
is possible that we could get away with fixed values for Broken Sword 2, since
it has always had subtitles. But for Broken Sword 1, subtitles is a ScummVM
addition, and we can't.

svn-id: r49154
 2010-05-23 11:16:10 +00:00
Torbjörn Andersson
8ed56e1834 Keep the Broken Sword cutscene players from using up all available CPU. 
Probably a regression from the recent video decoder rewrite, but I haven't
checked if it also present in other engines.

svn-id: r49153
 2010-05-23 10:50:14 +00:00
Matthew Hoops
11cbdd0318 Committing the rest of the VideoDecoder Rewrite from patch #2963496. 
svn-id: r49079
 2010-05-18 14:17:24 +00:00
Matthew Hoops
c7fa1074fb Change VideoDecoder::getCurFrame() to mean the last frame drawn instead of the next frame to draw. This is patch 1 from patch #2963496 (VideoDecoder Rewrite). 
svn-id: r49063
 2010-05-17 21:59:05 +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
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
Johannes Schickel
84f3034406 - Move openStreamFile from AudioStream to SeekableAudioStream. 
- Fix documentation of openStreamFile.

svn-id: r47080
 2010-01-06 15:23:33 +00:00
Max Horn
51933629d1 Changed foo(void) to foo() in almost all non-backend source files 
svn-id: r45616
 2009-11-02 21:54:57 +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
Jordi Vilalta Prat
3337be7b08 Fix indentation 
svn-id: r43837
 2009-08-30 20:50:23 +00:00
Torbjörn Andersson
f853376379 Fixed drawing subtitles for cutscenes that are narrower than the screen, and 
erase the subtitles manually if they are drawn outside the frame.

svn-id: r42859
 2009-07-28 17:19:33 +00:00
Filippos Karapetis
6ec870303f - Reverted commit #40730, as it introduced rounding errors 
- Properly fixed the FLIC player
- The sound chunk tag of DXA files is now read by the DXADecoder's loadFile() method

svn-id: r40736
 2009-05-20 10:43:18 +00:00
Filippos Karapetis
e358b13ef9 Changed calculations based on frame delay to be based on the scale of 1ms, not 1/100. This fixes the FLIC player and also makes the overall code a bit clearer and easier to understand 
svn-id: r40730
 2009-05-19 19:56:53 +00:00
Max Horn
e080a59337 Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as well as some other tweaks 
svn-id: r39255
 2009-03-09 03:45:23 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab 
svn-id: r39203
 2009-03-07 19:24:31 +00:00