[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.12,1.13 mixer.cpp,1.165,1.166
Max Horn
fingolfin at users.sourceforge.net
Tue Sep 28 13:28:36 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.cpp,1.25,1.26 ListWidget.cpp,1.36,1.37 PopUpWidget.cpp,1.31,1.32 console.cpp,1.49,1.50 message.cpp,1.20,1.21 newgui.cpp,1.86,1.87
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common system.cpp,1.12,1.13 system.h,1.69,1.70 timer.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3612/sound
Modified Files:
audiocd.cpp mixer.cpp
Log Message:
Rename remaining OSystem methods to match our coding guidelines
Index: audiocd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- audiocd.cpp 26 Apr 2004 20:28:34 -0000 1.12
+++ audiocd.cpp 28 Sep 2004 20:19:33 -0000 1.13
@@ -81,7 +81,7 @@
_cd.playing = true;
_track_info[index]->play(g_engine->_mixer, &_cd.handle, _cd.start, _cd.duration);
} else {
- g_system->play_cdrom(track, numLoops, startFrame, duration);
+ g_system->playCD(track, numLoops, startFrame, duration);
}
}
}
@@ -91,12 +91,12 @@
g_engine->_mixer->stopHandle(_cd.handle);
_cd.playing = false;
} else {
- g_system->stop_cdrom();
+ g_system->stopCD();
}
}
bool AudioCDManager::isPlaying() const {
- return _cd.playing || g_system->poll_cdrom();
+ return _cd.playing || g_system->pollCD();
}
void AudioCDManager::updateCD() {
@@ -116,7 +116,7 @@
}
}
} else {
- g_system->update_cdrom();
+ g_system->updateCD();
}
}
Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- mixer.cpp 19 Sep 2004 13:54:24 -0000 1.165
+++ mixer.cpp 28 Sep 2004 20:19:33 -0000 1.166
@@ -568,7 +568,7 @@
}
_samplesConsumed = _samplesDecoded;
- _mixerTimeStamp = g_system->get_msecs();
+ _mixerTimeStamp = g_system->getMillis();
_converter->flow(*_input, data, len, vol_l, vol_r);
@@ -588,7 +588,7 @@
uint32 seconds = _samplesConsumed / rate;
uint32 milliseconds = (1000 * (_samplesConsumed % rate)) / rate;
- uint32 delta = g_system->get_msecs() - _mixerTimeStamp;
+ uint32 delta = g_system->getMillis() - _mixerTimeStamp;
// In theory it would seem like a good idea to limit the approximation
// so that it never exceeds the theoretical upper bound set by
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.cpp,1.25,1.26 ListWidget.cpp,1.36,1.37 PopUpWidget.cpp,1.31,1.32 console.cpp,1.49,1.50 message.cpp,1.20,1.21 newgui.cpp,1.86,1.87
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common system.cpp,1.12,1.13 system.h,1.69,1.70 timer.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list