Bugfix #4135

Mixdown option (blending sequence audio strips) didn't write proper WAV.
- file length in header chunk was too short (potential crasher)
- endian switch code used swab(), which wasn't defined to work when src and
  target is identical
- cleaned up some code too... like removing timecursor() for core loop.

1 files changed, 3 insertions, 18 deletions

diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 30b38d2c2d7..7e685465e4b 100644
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -314,12 +314,7 @@ void sound_read_wav_data(bSound* sound, PackedFile* pf)
 		readPackedFile(pf, &shortbuf, 2);
 		if(G.order==B_ENDIAN)
 		{
-			/* was SWITCH_SHORT before */
-			char s_i, *p_i;
-			p_i= (char *)&(shortbuf);
-			s_i= p_i[0];
-			p_i[0]= p_i[1];
-			p_i[1]= s_i;
+			SWITCH_SHORT(shortbuf);
 		}
 
 		/* read the number of channels */
@@ -327,12 +322,7 @@ void sound_read_wav_data(bSound* sound, PackedFile* pf)
 
 		if(G.order==B_ENDIAN)
 		{
-			/* was SWITCH_SHORT before */
-			char s_i, *p_i;
-			p_i= (char *)&(shortbuf);
-			s_i= p_i[0];
-			p_i[0]= p_i[1];
-			p_i[1]= s_i;
+			SWITCH_SHORT(shortbuf);
 		}
 
 		/* check the number of channels */
@@ -367,12 +357,7 @@ void sound_read_wav_data(bSound* sound, PackedFile* pf)
 		readPackedFile(pf, &shortbuf, 2);
 		if(G.order==B_ENDIAN)
 		{
-			/* was SWITCH_SHORT before */
-			char s_i, *p_i;
-			p_i= (char *)&(shortbuf);
-			s_i= p_i[0];
-			p_i[0]= p_i[1];
-			p_i[1]= s_i;
+			SWITCH_SHORT(shortbuf);
 		}
 		bits = shortbuf;