[Sc2-cvs] SF.net SVN: sc2:[3615] trunk/sc2/src/libs/sound/trackplayer.c

[<av...@us...>]

Revision: 3615
          http://sc2.svn.sourceforge.net/sc2/?rev=3615&view=rev
Author:   avolkov
Date:     2011-05-17 18:58:06 +0000 (Tue, 17 May 2011)

Log Message:
-----------
Fix alien comm flickers when using number speech and other spliced pieces

Modified Paths:
--------------
    trunk/sc2/src/libs/sound/trackplayer.c

Modified: trunk/sc2/src/libs/sound/trackplayer.c
===================================================================
--- trunk/sc2/src/libs/sound/trackplayer.c	2011-05-17 18:45:21 UTC (rev 3614)
+++ trunk/sc2/src/libs/sound/trackplayer.c	2011-05-17 18:58:06 UTC (rev 3615)
@@ -393,6 +393,7 @@
 
 			chunks_tail->next = create_SoundChunk (track_decs[tracks], sound_sample->length);
 			chunks_tail = chunks_tail->next;
+			chunks_tail->track_num = track_count - 1;
 			sound_sample->length += track_decs[tracks]->length;
 		}
 		else
@@ -580,10 +581,10 @@
 					dec_offset, time_stamps[page]);
 #endif
 			sound_sample->length += decoder->length;
+			chunks_tail->track_num = track_count - 1;
 			if (!no_page_break)
 			{
 				chunks_tail->tag_me = 1;
-				chunks_tail->track_num = track_count - 1;
 				if (page < num_pages)
 				{
 					chunks_tail->text = pages[page];
@@ -773,12 +774,9 @@
 create_SoundChunk (TFB_SoundDecoder *decoder, float start_time)
 {
 	TFB_SoundChunk *chunk;
-	chunk = HMalloc (sizeof (TFB_SoundChunk));
+	chunk = HCalloc (sizeof (*chunk));
 	chunk->decoder = decoder;
-	chunk->next = NULL;
 	chunk->start_time = start_time;
-	chunk->tag_me = 0;
-	chunk->text = 0;
 	return chunk;
 }
 


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