[Scummvm-cvs-logs] scummvm master -> 949919bebd3923d59de3f4999e3b5c471fa00374

csnover csnover at users.noreply.github.com
Sat Aug 6 18:37:51 CEST 2016


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:
949919bebd SCI32: Remove VMD flags from Audio32 mixer


Commit: 949919bebd3923d59de3f4999e3b5c471fa00374
    https://github.com/scummvm/scummvm/commit/949919bebd3923d59de3f4999e3b5c471fa00374
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-08-06T11:37:18-05:00

Commit Message:
SCI32: Remove VMD flags from Audio32 mixer

The VMD decoder sends audio directly to the system mixer.

Changed paths:
    engines/sci/sound/audio32.cpp
    engines/sci/sound/audio32.h



diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index 0cf8e3c..288b7c0 100644
--- a/engines/sci/sound/audio32.cpp
+++ b/engines/sci/sound/audio32.cpp
@@ -309,11 +309,6 @@ int Audio32::readBuffer(Audio::st_sample_t *buffer, const int numSamples) {
 			continue;
 		}
 
-		if (channel.vmd) {
-			// TODO: VMD audio into output buffer
-			continue;
-		}
-
 		Audio::st_volume_t leftVolume, rightVolume;
 
 		if (channel.pan == -1 || !isStereo()) {
@@ -605,7 +600,6 @@ uint16 Audio32::play(int16 channelIndex, const ResourceId resourceId, const bool
 	channel.resource = resource;
 	channel.loop = loop;
 	channel.robot = false;
-	channel.vmd = false;
 	channel.fadeStartTick = 0;
 	channel.soundNode = soundNode;
 	channel.volume = volume < 0 || volume > kMaxVolume ? (int)kMaxVolume : volume;
diff --git a/engines/sci/sound/audio32.h b/engines/sci/sound/audio32.h
index b0c1ba1..ac3176c 100644
--- a/engines/sci/sound/audio32.h
+++ b/engines/sci/sound/audio32.h
@@ -123,12 +123,6 @@ struct AudioChannel {
 	bool robot;
 
 	/**
-	 * Whether or not this channel contains a VMD audio
-	 * track.
-	 */
-	bool vmd;
-
-	/**
 	 * For digital sound effects, the related VM
 	 * Sound::nodePtr object for the sound.
 	 */






More information about the Scummvm-git-logs mailing list