[Scummvm-cvs-logs] SF.net SVN: scummvm: [30308] scummvm/trunk/engines/scumm/imuse_digi/dimuse. cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jan 6 15:59:46 CET 2008


Revision: 30308
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30308&view=rev
Author:   fingolfin
Date:     2008-01-06 06:59:46 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
Unify mixer pan/vol setting code

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-06 14:57:28 UTC (rev 30307)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-06 14:59:46 UTC (rev 30308)
@@ -321,8 +321,6 @@
 						curFeedSize = feedSize;
 
 					if (_mixer->isReady()) {
-						_mixer->setChannelVolume(track->mixChanHandle, track->getVol());
-						_mixer->setChannelBalance(track->mixChanHandle, track->getPan());
 						track->stream->queueBuffer(tmpSndBufferPtr, curFeedSize);
 						track->regionOffset += curFeedSize;
 					} else
@@ -336,12 +334,11 @@
 					feedSize -= curFeedSize;
 					assert(feedSize >= 0);
 				} while (feedSize != 0);
-			} else {
-				if (_mixer->isReady()) {
-					_mixer->setChannelVolume(track->mixChanHandle, track->getVol());
-					_mixer->setChannelBalance(track->mixChanHandle, track->getPan());
-				}
 			}
+			if (_mixer->isReady()) {
+				_mixer->setChannelVolume(track->mixChanHandle, track->getVol());
+				_mixer->setChannelBalance(track->mixChanHandle, track->getPan());
+			}
 		}
 	}
 }


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




More information about the Scummvm-git-logs mailing list