buffer up all the audio upfront

OpenRA.FileFormats/Graphics/VqaReader.cs

@@ -8,12 +8,9 @@
  */
 #endregion
 
-using System.Collections;
+using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System;
-using System.Drawing.Imaging;
 
 namespace OpenRA.FileFormats
 {
@@ -49,6 +46,7 @@ namespace OpenRA.FileFormats
 		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
 
 		public byte[] AudioData { get { return audioData; } }
+		public int CurrentFrame { get { return currentFrame; } }
 		
 		public VqaReader( Stream stream )
 		{
@@ -109,11 +107,47 @@ namespace OpenRA.FileFormats
 				offsets[i] <<= 1;
 			}
 
+			CollectAudioData();
+			
 			// Load the first frame
 			currentFrame = 0;
 			AdvanceFrame();
 		}
 
+		void CollectAudioData()
+		{
+			var ms = new MemoryStream();
+			var adpcmIndex = 0;
+
+			for (var i = 0; i < Frames; i++)
+			{
+				stream.Seek(offsets[i], SeekOrigin.Begin);
+				BinaryReader reader = new BinaryReader(stream);
+				var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
+
+				while (reader.BaseStream.Position < end)
+				{
+					var type = new String(reader.ReadChars(4));
+					var length = Swap(reader.ReadUInt32());
+
+					switch (type)
+					{
+						case "SND2":
+							var rawAudio = reader.ReadBytes((int)length);
+							ms.Write(rawAudio);
+							break;
+						default:
+							reader.ReadBytes((int)length);
+							break;
+					}
+
+					if (reader.PeekChar() == 0) reader.ReadByte();
+				}
+			}
+
+			audioData = AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex);
+		}
+
 		public void AdvanceFrame()
 		{			
 			// Seek to the start of the frame
@@ -129,11 +163,8 @@ namespace OpenRA.FileFormats
 				switch(type)
 				{
 					case "SND2":
-						// Don't parse sound (yet); skip data
+						// Don't parse sound here.
-						{
+						reader.ReadBytes((int)length);
-							var rawAudio = reader.ReadBytes((int)length);
-							audioData = AudLoader.LoadSound(rawAudio, ref adpcmIndex);
-						}
 						break;
 					case "VQFR":
 						DecodeVQFR(reader);
@@ -149,8 +180,6 @@ namespace OpenRA.FileFormats
 				currentFrame = cbOffset = cbChunk = 0;
 		}
 		
-		int adpcmIndex = 0;
-		
 		// VQA Frame
 		public void DecodeVQFR(BinaryReader reader)
 		{			

OpenRA.Game/Sound.cs

@@ -48,10 +48,11 @@ namespace OpenRA
 
 		public static void SetListenerPosition(float2 position) { soundEngine.SetListenerPosition(position); }
 
+		static ISoundSource rawSource;
 		public static void PlayRaw(byte[] raw)
 		{
-			var sound = LoadSoundRaw(raw);
+			rawSource = LoadSoundRaw(raw);
-			soundEngine.Play2D(sound, false, true, float2.Zero, SoundVolume);
+			soundEngine.Play2D(rawSource, false, true, float2.Zero, SoundVolume);
 		}
 
 		public static void Play(string name)

OpenRA.Game/Widgets/VqaPlayerWidget.cs

@@ -7,13 +7,11 @@
  * see LICENSE.
  */
 #endregion
+
 using System;
 using System.Drawing;
-using System.Linq;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-using OpenRA.Widgets;
 using OpenRA.FileFormats;
+using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
@@ -39,17 +37,20 @@ namespace OpenRA.Widgets
 		public override void DrawInner(World world)
 		{
 			if (video == null)
+			{
 				LoadVideo(Video);
+				Sound.PlayRaw(video.AudioData);
+			}
 			
 			int t = Environment.TickCount;
 			int dt = t - lastTime;
 			
 			if (advanceNext)
 			{
+				if (video.CurrentFrame == 0)
+					Sound.PlayRaw(video.AudioData);
 				advanceNext = false;
 				video.AdvanceFrame();
-
-				Sound.PlayRaw(video.AudioData);
 			}
 			
 			if (dt > timestep)

mods/ra/chrome/mainmenu.yaml

@@ -3,7 +3,7 @@ VqaPlayer:
 	Y:WINDOW_BOTTOM - 200
 	Width:200
 	Height:200
-	Video:aagun.vqa
+	Video:ally10.vqa
 Background@MAINMENU_BG:
 	Id:MAINMENU_BG
 	X:(WINDOW_RIGHT - WIDTH)/2