aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth/fmtowns_pc98
diff options
context:
space:
mode:
authorathrxx2011-05-20 16:21:39 +0200
committerathrxx2011-05-20 20:28:18 +0200
commit2ef8e9a2025fb522825cd8b39af331a2faae2f1f (patch)
tree3d1148fef461e5912a79e1efdf2b5742d8f6c262 /audio/softsynth/fmtowns_pc98
parent2d1fa6c3f8bdc635d49978ad48f72619707d6893 (diff)
downloadscummvm-rg350-2ef8e9a2025fb522825cd8b39af331a2faae2f1f.tar.gz
scummvm-rg350-2ef8e9a2025fb522825cd8b39af331a2faae2f1f.tar.bz2
scummvm-rg350-2ef8e9a2025fb522825cd8b39af331a2faae2f1f.zip
FM-TOWNS AUDIO: fix gcc warnings
Diffstat (limited to 'audio/softsynth/fmtowns_pc98')
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_audio.cpp4
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp8
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 635f9354cc..5161871601 100644
--- a/audio/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -1890,9 +1890,9 @@ void TownsAudioInterface::setSoundEffectChanMask(int mask) {
}
void TownsAudioInterface::lockInternal() {
- _intf->lock();
+ _intf->mutexLock();
}
void TownsAudioInterface::unlockInternal() {
- _intf->unlock();
+ _intf->mutexUnlock();
}
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index b09a9f65d1..4336de9bdb 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -1147,7 +1147,7 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) {
bool locked = false;
if (_ready) {
- lock();
+ mutexLock();
locked = true;
}
@@ -1201,7 +1201,7 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) {
}
if (locked)
- unlock();
+ mutexUnlock();
delete[] tmpStart;
@@ -1220,11 +1220,11 @@ int TownsPC98_FmSynth::getRate() const {
return _mixer->getOutputRate();
}
-void TownsPC98_FmSynth::lock() {
+void TownsPC98_FmSynth::mutexLock() {
_mutex.lock();
}
-void TownsPC98_FmSynth::unlock() {
+void TownsPC98_FmSynth::mutexUnlock() {
_mutex.unlock();
}
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
index a1b09abd3a..6ea9815a72 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
@@ -73,8 +73,8 @@ public:
bool endOfData() const;
int getRate() const;
- void lock();
- void unlock();
+ void mutexLock();
+ void mutexUnlock();
protected:
void deinit();