aboutsummaryrefslogtreecommitdiff
path: root/backends/sdl/sdl.cpp
diff options
context:
space:
mode:
authorMax Horn2004-09-28 20:19:37 +0000
committerMax Horn2004-09-28 20:19:37 +0000
commitce8c99bf62838099142aa79f2935e64639aa5571 (patch)
tree5a2ea91139133878cdffab8ed86033fbf5448ea9 /backends/sdl/sdl.cpp
parent6a50ba2308c6a9fc3eb733f310c87ed279b565ed (diff)
downloadscummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.gz
scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.tar.bz2
scummvm-rg350-ce8c99bf62838099142aa79f2935e64639aa5571.zip
Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
Diffstat (limited to 'backends/sdl/sdl.cpp')
-rw-r--r--backends/sdl/sdl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index c7292ad554..f6ad91b452 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -128,11 +128,11 @@ OSystem_SDL::~OSystem_SDL() {
SDL_Quit();
}
-uint32 OSystem_SDL::get_msecs() {
+uint32 OSystem_SDL::getMillis() {
return SDL_GetTicks();
}
-void OSystem_SDL::delay_msecs(uint msecs) {
+void OSystem_SDL::delayMillis(uint msecs) {
SDL_Delay(msecs);
}
@@ -343,12 +343,12 @@ bool OSystem_SDL::openCD(int drive) {
return (_cdrom != NULL);
}
-void OSystem_SDL::stop_cdrom() { /* Stop CD Audio in 1/10th of a second */
+void OSystem_SDL::stopCD() { /* Stop CD Audio in 1/10th of a second */
cd_stop_time = SDL_GetTicks() + 100;
cd_num_loops = 0;
}
-void OSystem_SDL::play_cdrom(int track, int num_loops, int start_frame, int duration) {
+void OSystem_SDL::playCD(int track, int num_loops, int start_frame, int duration) {
if (!num_loops && !start_frame)
return;
@@ -372,14 +372,14 @@ void OSystem_SDL::play_cdrom(int track, int num_loops, int start_frame, int dura
cd_end_time = SDL_GetTicks() + _cdrom->track[track].length * 1000 / CD_FPS;
}
-bool OSystem_SDL::poll_cdrom() {
+bool OSystem_SDL::pollCD() {
if (!_cdrom)
return false;
return (cd_num_loops != 0 && (SDL_GetTicks() < cd_end_time || SDL_CDStatus(_cdrom) != CD_STOPPED));
}
-void OSystem_SDL::update_cdrom() {
+void OSystem_SDL::updateCD() {
if (!_cdrom)
return;