From: kramm <kramm>
Date: Wed, 7 Dec 2005 19:38:42 +0000 (+0000)
Subject: swf_SetSoundDefine() now uses swf_SetSoundDefineRaw() if there's no
X-Git-Tag: release-0-8-0~283
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=c9694fd8520a93d6c124a36df27f02d533014d07

swf_SetSoundDefine() now uses swf_SetSoundDefineRaw() if there's no
mp3 support compiled in.
---

diff --git a/lib/modules/swfsound.c b/lib/modules/swfsound.c
index 8edec35..bcd3951 100644
--- a/lib/modules/swfsound.c
+++ b/lib/modules/swfsound.c
@@ -77,6 +77,13 @@ void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int numsamples, char first)
 }
 #endif
 
+void swf_SetSoundDefineRaw(TAG*tag, S16*samples, int numsamples)
+{
+    swf_SetU8(tag,(/*compression*/0<<4)|(/*rate*/3<<2)|(/*size*/1<<1)|/*mono*/0);
+    swf_SetU32(tag, numsamples); // 44100 -> 11025
+    swf_SetBlock(tag, (U8*)samples, numsamples*2);
+}
+
 /* TODO: find a better way to set these from the outside */
 
 int swf_mp3_in_samplerate = 44100;
@@ -192,12 +199,6 @@ void swf_SetSoundStreamEnd(TAG*tag)
     lame_close (lame_flags);
 }
 
-void swf_SetSoundDefineRaw(TAG*tag, S16*samples, int num, int samplerate)
-{
-    //swf_SetU8(tag,(/*compression*/0<<4)|(/*rate*/3<<2)|(/*size*/1<<1)|/*mono*/0);
-    //swf_SetU32(tag, numsamples); // 44100 -> 11025
-    //swf_SetBlock(tag, wav2.data, numsamples*2);
-}
 void swf_SetSoundDefine(TAG*tag, S16*samples, int num)
 {
     char*buf;
@@ -266,13 +267,9 @@ void swf_SetSoundStreamEnd(TAG*tag)
 {
     fprintf(stderr, "Error: no sound support compiled in.\n");exit(1);
 }
-void swf_SetSoundDefineRaw(TAG*tag, S16*samples, int num, int samplerate)
-{
-    fprintf(stderr, "Error: no sound support compiled in.\n");exit(1);
-}
 void swf_SetSoundDefine(TAG*tag, S16*samples, int num)
 {
-    fprintf(stderr, "Error: no sound support compiled in.\n");exit(1);
+    swf_SetSoundDefineRaw(tag, samples,num);
 }
 
 #endif