[Scummvm-cvs-logs] SF.net SVN: scummvm:[46860] scummvm/trunk/engines/kyra/sound_adlib.cpp

[lordhoto at users.sourceforge.net]

Revision: 46860
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46860&view=rev
Author:   lordhoto
Date:     2010-01-01 22:33:45 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
Merge update_nop1 and update_nop2.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_adlib.cpp

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2010-01-01 22:26:26 UTC (rev 46859)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2010-01-01 22:33:45 UTC (rev 46860)
@@ -301,11 +301,10 @@
 	int update_removePrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value);
 	int updateCallback41(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_resetToGlobalTempo(uint8 *&dataptr, Channel &channel, uint8 value);
-	int update_nop1(uint8 *&dataptr, Channel &channel, uint8 value);
+	int update_nop(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_setDurationRandomness(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_changeChannelTempo(uint8 *&dataptr, Channel &channel, uint8 value);
 	int updateCallback46(uint8 *&dataptr, Channel &channel, uint8 value);
-	int update_nop2(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_setupRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_playRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_removeRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value);
@@ -1655,7 +1654,7 @@
 	return 0;
 }
 
-int AdlibDriver::update_nop1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdlibDriver::update_nop(uint8 *&dataptr, Channel &channel, uint8 value) {
 	--dataptr;
 	return 0;
 }
@@ -1688,14 +1687,6 @@
 	return 0;
 }
 
-// TODO: This is really the same as update_nop1(), so they should be combined
-//       into one single update_nop().
-
-int AdlibDriver::update_nop2(uint8 *&dataptr, Channel &channel, uint8 value) {
-	--dataptr;
-	return 0;
-}
-
 int AdlibDriver::update_setupRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
 	int channelBackUp = _curChannel;
 	int regOffsetBackUp = _curRegOffset;
@@ -2031,7 +2022,7 @@
 		COMMAND(update_stopChannel),
 		COMMAND(updateCallback41),
 		COMMAND(update_resetToGlobalTempo),
-		COMMAND(update_nop1),
+		COMMAND(update_nop),
 
 		// 60
 		COMMAND(update_setDurationRandomness),
@@ -2040,7 +2031,7 @@
 		COMMAND(updateCallback46),
 
 		// 64
-		COMMAND(update_nop2),
+		COMMAND(update_nop),
 		COMMAND(update_setupRhythmSection),
 		COMMAND(update_playRhythmSection),
 		COMMAND(update_removeRhythmSection),


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