diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/sky/music | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines/sky/music')
| -rw-r--r-- | engines/sky/music/adlibchannel.cpp | 4 | ||||
| -rw-r--r-- | engines/sky/music/adlibmusic.cpp | 12 | ||||
| -rw-r--r-- | engines/sky/music/musicbase.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index fa589d64c0..588057a7c8 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" #include "sky/music/adlibchannel.h" @@ -158,7 +158,7 @@ uint8 AdlibChannel::process(uint16 aktTime) { case 8: com90_loopMusic(); break; case 9: com90_keyOff(); break; case 12: com90_setLoopPoint(); break; - + default: error("AdlibChannel: Unknown music opcode 0x%02X", opcode); break; diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 03588f1fca..7c2b262d82 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sky/music/adlibmusic.h" @@ -122,16 +122,16 @@ void AdlibMusic::setVolume(uint16 param) { _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 2 * param); } -bool AdlibMusic::isStereo(void) const { - return false; +bool AdlibMusic::isStereo(void) const { + return false; } bool AdlibMusic::endOfData(void) const { - return false; + return false; } -int AdlibMusic::getRate(void) const { - return _sampleRate; +int AdlibMusic::getRate(void) const { + return _sampleRate; } } // End of namespace Sky diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index 40556e7e8a..ecb369c217 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -26,7 +26,7 @@ #ifndef SKY_MUSIC_MUSICBASE_H #define SKY_MUSIC_MUSICBASE_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/mutex.h" |