[Scummvm-cvs-logs] SF.net SVN: scummvm:[44186] scummvm/trunk/engines/scumm/imuse

[lordhoto at users.sourceforge.net]

Revision: 44186
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44186&view=rev
Author:   lordhoto
Date:     2009-09-18 15:54:39 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse_internal.h
    scummvm/trunk/engines/scumm/imuse/imuse_part.cpp

Modified: scummvm/trunk/engines/scumm/imuse/imuse_internal.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_internal.h	2009-09-18 15:54:12 UTC (rev 44185)
+++ scummvm/trunk/engines/scumm/imuse/imuse_internal.h	2009-09-18 15:54:39 UTC (rev 44186)
@@ -361,7 +361,6 @@
 	void fix_after_load();
 
 	void sendAll();
-	void sendPitchBend();
 	bool clearToTransmit();
 
 	Part();
@@ -369,8 +368,9 @@
 	void saveLoadWithSerializer(Serializer *ser);
 
 private:
-	void setPanPosition(uint8 value);
-	void setEffectLevel(uint8 value);
+	void sendPitchBend();
+	void sendPanPosition(uint8 value);
+	void sendEffectLevel(uint8 value);
 };
 
 

Modified: scummvm/trunk/engines/scumm/imuse/imuse_part.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_part.cpp	2009-09-18 15:54:12 UTC (rev 44185)
+++ scummvm/trunk/engines/scumm/imuse/imuse_part.cpp	2009-09-18 15:54:39 UTC (rev 44186)
@@ -112,14 +112,12 @@
 
 void Part::set_detune(int8 detune) {
 	_detune_eff = clamp((_detune = detune) + _player->getDetune(), -128, 127);
-	if (_mc)
-		sendPitchBend();
+	sendPitchBend();
 }
 
 void Part::pitchBend(int16 value) {
 	_pitchbend = value;
-	if (_mc)
-		sendPitchBend();
+	sendPitchBend();
 }
 
 void Part::volume(byte value) {
@@ -136,13 +134,12 @@
 
 void Part::set_pan(int8 pan) {
 	_pan_eff = clamp((_pan = pan) + _player->getPan(), -64, 63);
-	setPanPosition(_pan_eff + 0x40);
+	sendPanPosition(_pan_eff + 0x40);
 }
 
 void Part::set_transpose(int8 transpose) {
 	_transpose_eff = transpose_clamp((_transpose = transpose) + _player->getTranspose(), -24, 24);
-	if (_mc)
-		sendPitchBend();
+	sendPitchBend();
 }
 
 void Part::sustain(bool value) {
@@ -165,7 +162,7 @@
 
 void Part::effectLevel(byte value) {
 	_effect_level = value;
-	setEffectLevel(value);
+	sendEffectLevel(value);
 }
 
 void Part::fix_after_load() {
@@ -328,20 +325,23 @@
 	_mc->volume(_vol_eff);
 	_mc->sustain(_pedal);
 	_mc->modulationWheel(_modwheel);
-	setPanPosition(_pan_eff + 0x40);
+	sendPanPosition(_pan_eff + 0x40);
 
 	if (_instrument.isValid())
 		_instrument.send(_mc);
 
 	// We need to send the effect level after setting up the instrument
 	// otherwise the reverb setting for MT-32 will be overwritten.
-	setEffectLevel(_effect_level);
+	sendEffectLevel(_effect_level);
 
 	_mc->chorusLevel(_chorus);
 	_mc->priority(_pri_eff);
 }
 
 void Part::sendPitchBend() {
+	if (!_mc)
+		return;
+
 	int16 bend = _pitchbend;
 	// RPN-based pitchbend range doesn't work for the MT32,
 	// so we'll do the scaling ourselves.
@@ -372,7 +372,7 @@
 	_mc->allNotesOff();
 }
 
-void Part::setPanPosition(uint8 value) {
+void Part::sendPanPosition(uint8 value) {
 	if (!_mc)
 		return;
 
@@ -385,7 +385,7 @@
 	_mc->panPosition(value);
 }
 
-void Part::setEffectLevel(uint8 value) {
+void Part::sendEffectLevel(uint8 value) {
 	if (!_mc)
 		return;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.