thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio

Browse source 
svn-id: r22231
This commit is contained in:
Max Horn 2006-04-29 22:33:31 +00:00
parent ac0ae13bee
commit 27307acd7c
59 changed files with 203 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/saveload.cpp
View file

@ -871,7 +871,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// as AudioCDManager::Status::playing, and MSVC6 has
// a fit with that. This typedef simplifies the notation
// to something MSVC6 can grasp.
typedef AudioCDManager::Status AudioCDManager_Status;
typedef Audio::AudioCDManager::Status AudioCDManager_Status;
const SaveLoadEntry audioCDEntries[] = {
MKLINE(AudioCDManager_Status, playing, sleUint32, VER(24)),
MKLINE(AudioCDManager_Status, track, sleInt32, VER(24)),
@ -1140,7 +1140,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// Save/load the Audio CD status
//
if (s->getVersion() >= VER(24)) {
AudioCDManager::Status info;
Audio::AudioCDManager::Status info;
if (s->isSaving())
info = AudioCD.getStatus();
s->saveLoadArrayOf(&info, 1, sizeof(info), audioCDEntries);