Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332

2 files changed, 6 insertions, 6 deletions

diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp
index e2f479e03b..1084b98fb8 100644
--- a/sound/audiocd.cpp
+++ b/sound/audiocd.cpp
@@ -81,7 +81,7 @@ void AudioCDManager::play(int track, int numLoops, int startFrame, int duration)
 			_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 @@ void AudioCDManager::stop() {
 		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 @@ void AudioCDManager::updateCD() {
 			}
 		}
 	} else {
-		g_system->update_cdrom();
+		g_system->updateCD();
 	}
 }
 
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 1ddcd86b03..954e7e15b4 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -568,7 +568,7 @@ void Channel::mix(int16 *data, uint len) {
 		}
 
 		_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 Channel::getElapsedTime() {
 	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