[Scummvm-cvs-logs] scummvm master -> 7804afd4cb2cbc6c5d291e781029005e304425bf

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7804afd4cb FM-TOWNS AUDIO: hopefully fix ps2 port compile


Commit: 7804afd4cb2cbc6c5d291e781029005e304425bf
    https://github.com/scummvm/scummvm/commit/7804afd4cb2cbc6c5d291e781029005e304425bf
Author: athrxx (athrxx at scummvm.org)
Date: 2011-05-17T12:43:07-07:00

Commit Message:
FM-TOWNS AUDIO: hopefully fix ps2 port compile

Changed paths:
    audio/softsynth/fmtowns_pc98/towns_midi.cpp
    audio/softsynth/fmtowns_pc98/towns_midi.h



diff --git a/audio/softsynth/fmtowns_pc98/towns_midi.cpp b/audio/softsynth/fmtowns_pc98/towns_midi.cpp
index e66d6be..e67a78e 100644
--- a/audio/softsynth/fmtowns_pc98/towns_midi.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_midi.cpp
@@ -835,7 +835,7 @@ const uint8 TownsMidiInputChannel::_programAdjustLevel[] = {
 };
 
 MidiDriver_TOWNS::MidiDriver_TOWNS(Audio::Mixer *mixer) : _timerProc(0), _timerProcPara(0), _channels(0), _out(0),
-	_chanState(0), _operatorLevelTable(0), _tickCounter1(0), _tickCounter2(0), _rand(1), _allocCurPos(0), _open(false) {
+	_chanState(0), _operatorLevelTable(0), _tickCounter1(0), _tickCounter2(0), _rand(1), _allocCurPos(0), _isOpen(false) {
 	_intf = new TownsAudioInterface(mixer, this);
 }
 
@@ -845,7 +845,7 @@ MidiDriver_TOWNS::~MidiDriver_TOWNS() {
 }
 
 int MidiDriver_TOWNS::open() {
-	if (_open)
+	if (_isOpen)
 		return MERR_ALREADY_OPEN;
 
 	if (!_intf->init())
@@ -882,16 +882,16 @@ int MidiDriver_TOWNS::open() {
 	 _allocCurPos = 0;
 	 _rand = 1;
 
-	_open = true;
+	_isOpen = true;
 
 	return 0;
 }
 
 void MidiDriver_TOWNS::close() {
-	if (!_open)
+	if (!_isOpen)
 		return;
 
-	_open = false;
+	_isOpen = false;
 
 	setTimerCallback(0, 0);
 	g_system->delayMillis(20);
@@ -917,7 +917,7 @@ void MidiDriver_TOWNS::close() {
 }
 
 void MidiDriver_TOWNS::send(uint32 b) {
-	if (!_open)
+	if (!_isOpen)
 		return;
 
 	byte param2 = (b >> 16) & 0xFF;
@@ -964,7 +964,7 @@ uint32 MidiDriver_TOWNS::getBaseTempo() {
 }
 
 MidiChannel *MidiDriver_TOWNS::allocateChannel() {
-	if (!_open)
+	if (!_isOpen)
 		return 0;
 
 	for (int i = 0; i < 32; ++i) {		
@@ -981,7 +981,7 @@ MidiChannel *MidiDriver_TOWNS::getPercussionChannel() {
 }
 
 void MidiDriver_TOWNS::timerCallback(int timerId) {
-	if (!_open)
+	if (!_isOpen)
 		return;
 
 	switch (timerId) {
diff --git a/audio/softsynth/fmtowns_pc98/towns_midi.h b/audio/softsynth/fmtowns_pc98/towns_midi.h
index 2b6e1df..20e986f 100644
--- a/audio/softsynth/fmtowns_pc98/towns_midi.h
+++ b/audio/softsynth/fmtowns_pc98/towns_midi.h
@@ -41,7 +41,7 @@ public:
 	~MidiDriver_TOWNS();
 
 	int open();
-	bool isOpen() const { return _open; }
+	bool isOpen() const { return _isOpen; }
 	void close();
 
 	void send(uint32 b);
@@ -76,7 +76,7 @@ private:
 	uint8 _allocCurPos;
 	uint8 _rand;
 	
-	bool _open;
+	bool _isOpen;
 
 	uint8 *_operatorLevelTable;
 };