diff options
author | Travis Howell | 2009-07-10 00:07:26 +0000 |
---|---|---|
committer | Travis Howell | 2009-07-10 00:07:26 +0000 |
commit | 4e99bee142899dae1385210012dd34453920fe54 (patch) | |
tree | 1ff2f4e640b6aa7cbe8e35b887e55c6c3e063de8 /sound | |
parent | ff208c5387a8566546a384afa9ab48c0a1f356a0 (diff) | |
parent | e8e9b882275b8dc5d77db3b1faaf30466c7b7a31 (diff) | |
download | scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.tar.gz scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.tar.bz2 scummvm-rg350-4e99bee142899dae1385210012dd34453920fe54.zip |
Merged revisions 42277-42278,42286-42290,42292-42293,42297,42300-42301,42303,42305-42306 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r42277 | drmccoy | 2009-07-09 12:54:10 +1000 (Thu, 09 Jul 2009) | 1 line
Giving Font its own real class
........
r42278 | dreammaster | 2009-07-09 13:07:30 +1000 (Thu, 09 Jul 2009) | 1 line
Changed the status of the cruise engine to be enabled by default
........
r42286 | drmccoy | 2009-07-09 19:39:51 +1000 (Thu, 09 Jul 2009) | 1 line
Warn instead of crash when a video frame part was found although the header says there's no video
........
r42287 | thebluegr | 2009-07-09 23:17:46 +1000 (Thu, 09 Jul 2009) | 1 line
Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*)
........
r42288 | thebluegr | 2009-07-10 01:12:35 +1000 (Fri, 10 Jul 2009) | 3 lines
- Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically.
- Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them
- Simplified the MSVC9 <-> MSVC8 conversion tools a bit
........
r42289 | thebluegr | 2009-07-10 01:15:49 +1000 (Fri, 10 Jul 2009) | 1 line
Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly
........
r42290 | thebluegr | 2009-07-10 01:17:45 +1000 (Fri, 10 Jul 2009) | 1 line
Added proper safeguards for shorten.*, thereby fixing commit 42259
........
r42292 | lordhoto | 2009-07-10 01:32:06 +1000 (Fri, 10 Jul 2009) | 1 line
Cleanup.
........
r42293 | lordhoto | 2009-07-10 01:32:25 +1000 (Fri, 10 Jul 2009) | 1 line
Cleanup rollDice (the results of the old and the new function are almost identical).
........
r42297 | thebluegr | 2009-07-10 01:46:26 +1000 (Fri, 10 Jul 2009) | 1 line
restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260)
........
r42300 | thebluegr | 2009-07-10 01:54:18 +1000 (Fri, 10 Jul 2009) | 1 line
Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", with some slight formatting changes
........
r42301 | lordhoto | 2009-07-10 01:59:20 +1000 (Fri, 10 Jul 2009) | 1 line
Fix wrong format arugment.
........
r42303 | lordhoto | 2009-07-10 02:16:08 +1000 (Fri, 10 Jul 2009) | 1 line
By comparing the commit log of r42300, it seems that "off" was renamed to "lastDirectoryOffset". I changed the SCI32 specific code to use that now. I can't assure this is anyhow correct, so anyone with knowledge of this code please check it.
........
r42305 | lordhoto | 2009-07-10 02:23:22 +1000 (Fri, 10 Jul 2009) | 1 line
Add fixme about SCI32 specific code.
........
r42306 | lordhoto | 2009-07-10 02:24:59 +1000 (Fri, 10 Jul 2009) | 1 line
Oops specify the correct revsision number in the fixme.
........
svn-id: r42318
Diffstat (limited to 'sound')
-rw-r--r-- | sound/iff_sound.cpp (renamed from sound/iff.cpp) | 2 | ||||
-rw-r--r-- | sound/iff_sound.h (renamed from sound/iff.h) | 0 | ||||
-rw-r--r-- | sound/module.mk | 2 | ||||
-rw-r--r-- | sound/shorten.cpp | 13 | ||||
-rw-r--r-- | sound/shorten.h | 12 |
5 files changed, 18 insertions, 11 deletions
diff --git a/sound/iff.cpp b/sound/iff_sound.cpp index 1df58b178c..60a1486ed5 100644 --- a/sound/iff.cpp +++ b/sound/iff_sound.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/iff.h" +#include "sound/iff_sound.h" #include "sound/audiostream.h" #include "sound/mixer.h" #include "common/func.h" diff --git a/sound/iff.h b/sound/iff_sound.h index 82106cb75e..82106cb75e 100644 --- a/sound/iff.h +++ b/sound/iff_sound.h diff --git a/sound/module.mk b/sound/module.mk index dba9501a38..3bcdd47c56 100644 --- a/sound/module.mk +++ b/sound/module.mk @@ -5,7 +5,7 @@ MODULE_OBJS := \ aiff.o \ audiocd.o \ audiostream.o \ - iff.o \ + iff_sound.o \ flac.o \ fmopl.o \ mididrv.o \ diff --git a/sound/shorten.cpp b/sound/shorten.cpp index d1031aed3a..e8066a49be 100644 --- a/sound/shorten.cpp +++ b/sound/shorten.cpp @@ -23,13 +23,9 @@ * */ -// The code in this file is currently only used in SAGA2 (in the -// SAGA engine), so if that engine isn't enabled, we will skip -// compiling it. If you plan to use this code in another engine, -// you will have to add the proper define check here. -// Also please add the define check at the comment after the -// matching #endif further down this file. -#if defined(ENABLE_SAGA2) +#include "sound/shorten.h" + +#ifdef SOUND_SHORTEN_H // Based on etree's Shorten tool, version 3.6.1 // http://etree.org/shnutils/shorten/ @@ -40,7 +36,6 @@ #include "common/util.h" #include "common/stream.h" -#include "sound/shorten.h" #include "sound/audiostream.h" #include "sound/mixer.h" @@ -535,5 +530,5 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) { } // End of namespace Audio -#endif // defined(ENABLE_SAGA2) +#endif // defined(SOUND_SHORTEN_H) diff --git a/sound/shorten.h b/sound/shorten.h index fa45ecc65d..c2a40280d3 100644 --- a/sound/shorten.h +++ b/sound/shorten.h @@ -23,6 +23,14 @@ * */ +// The code in this file is currently only used in SAGA2 (in the +// SAGA engine), so if that engine isn't enabled, we will skip +// compiling it. If you plan to use this code in another engine, +// you will have to add the proper define check here. +// Also please add the define check at the comment after the +// matching #endif further down this file. +#if defined(ENABLE_SAGA2) + #ifndef SOUND_SHORTEN_H #define SOUND_SHORTEN_H @@ -53,3 +61,7 @@ AudioStream *makeShortenStream(Common::ReadStream &stream); } // End of namespace Audio #endif + +#endif // defined(ENABLE_SAGA2) + + |