[cvs-annodex] commit (/annodex): libfishsound/branches/1.0-stable/src/libfishsound/fishsound.c libfishsound/branches/1.0-stable/src/libfishsound/private.h libfishsound/branches/1.0-stable/src/libfishsound/speex.c libfishsound/branches/1.0-stable/src/libfishsound/vorbis.c

[conrad]

Update of /annodex (new revision 1369)

Modified files:
   libfishsound/branches/1.0-stable/src/libfishsound/fishsound.c
   libfishsound/branches/1.0-stable/src/libfishsound/private.h
   libfishsound/branches/1.0-stable/src/libfishsound/speex.c
   libfishsound/branches/1.0-stable/src/libfishsound/vorbis.c

Log Message:
libfishsound-stable: backport internal encode rename from #304


Modified: libfishsound/branches/1.0-stable/src/libfishsound/fishsound.c
===================================================================
--- libfishsound/branches/1.0-stable/src/libfishsound/fishsound.c	2005-07-15 10:53:30 UTC (rev 1368)
+++ libfishsound/branches/1.0-stable/src/libfishsound/fishsound.c	2005-07-15 11:55:41 UTC (rev 1369)
@@ -195,11 +195,11 @@
 
 #if FS_ENCODE
   if (fsound->interleave) {
-    if (fsound->codec && fsound->codec->encode_i)
-      return fsound->codec->encode_i (fsound, pcm, frames);
+    if (fsound->codec && fsound->codec->encode_f_ilv)
+      return fsound->codec->encode_f_ilv (fsound, pcm, frames);
   } else {
-    if (fsound->codec && fsound->codec->encode_n)
-      return fsound->codec->encode_n (fsound, pcm, frames);
+    if (fsound->codec && fsound->codec->encode_f)
+      return fsound->codec->encode_f (fsound, pcm, frames);
   }
 #else
   return FISH_SOUND_ERR_DISABLED;

Modified: libfishsound/branches/1.0-stable/src/libfishsound/private.h
===================================================================
--- libfishsound/branches/1.0-stable/src/libfishsound/private.h	2005-07-15 10:53:30 UTC (rev 1368)
+++ libfishsound/branches/1.0-stable/src/libfishsound/private.h	2005-07-15 11:55:41 UTC (rev 1369)
@@ -57,10 +57,10 @@
 				       void * data, int datasize);
 typedef long        (*FSCodecDecode) (FishSound * fsound, unsigned char * buf,
 				      long bytes);
-typedef long        (*FSCodecEncodeI) (FishSound * fsound, float ** pcm,
-				       long frames);
-typedef long        (*FSCodecEncodeN) (FishSound * fsound, float ** pcm,
-				       long frames);
+typedef long        (*FSCodecEncode_Float) (FishSound * fsound, float * pcm[],
+					    long frames);
+typedef long        (*FSCodecEncode_FloatIlv) (FishSound * fsound,
+					       float ** pcm, long frames);
 typedef long        (*FSCodecFlush) (FishSound * fsound);
 
 struct _FishSoundFormat {
@@ -76,8 +76,8 @@
   FSCodecReset reset;
   FSCodecCommand command;
   FSCodecDecode decode;
-  FSCodecEncodeI encode_i;
-  FSCodecEncodeN encode_n;
+  FSCodecEncode_FloatIlv encode_f_ilv;
+  FSCodecEncode_Float encode_f;
   FSCodecFlush flush;
 };
 

Modified: libfishsound/branches/1.0-stable/src/libfishsound/speex.c
===================================================================
--- libfishsound/branches/1.0-stable/src/libfishsound/speex.c	2005-07-15 10:53:30 UTC (rev 1368)
+++ libfishsound/branches/1.0-stable/src/libfishsound/speex.c	2005-07-15 11:55:41 UTC (rev 1369)
@@ -453,7 +453,7 @@
 }
 
 static long
-fs_speex_encode_i (FishSound * fsound, float ** pcm, long frames)
+fs_speex_encode_f_ilv (FishSound * fsound, float ** pcm, long frames)
 {
   FishSoundSpeexInfo * fss = (FishSoundSpeexInfo *)fsound->codec_data;
   FishSoundSpeexEnc * fse = (FishSoundSpeexEnc *)fss->enc;
@@ -487,7 +487,7 @@
 }
 
 static long
-fs_speex_encode_n (FishSound * fsound, float * pcm[], long frames)
+fs_speex_encode_f (FishSound * fsound, float * pcm[], long frames)
 {
   FishSoundSpeexInfo * fss = (FishSoundSpeexInfo *)fsound->codec_data;
   FishSoundSpeexEnc * fse = (FishSoundSpeexEnc *)fss->enc;
@@ -654,8 +654,8 @@
   codec->reset = fs_speex_reset;
   codec->command = fs_speex_command;
   codec->decode = fs_speex_decode;
-  codec->encode_i = fs_speex_encode_i;
-  codec->encode_n = fs_speex_encode_n;
+  codec->encode_f = fs_speex_encode_f;
+  codec->encode_f_ilv = fs_speex_encode_f_ilv;
   codec->flush = fs_speex_flush;
 
   return codec;

Modified: libfishsound/branches/1.0-stable/src/libfishsound/vorbis.c
===================================================================
--- libfishsound/branches/1.0-stable/src/libfishsound/vorbis.c	2005-07-15 10:53:30 UTC (rev 1368)
+++ libfishsound/branches/1.0-stable/src/libfishsound/vorbis.c	2005-07-15 11:55:41 UTC (rev 1369)
@@ -343,7 +343,7 @@
 }
 
 static long
-fs_vorbis_encode_i (FishSound * fsound, float ** pcm, long frames)
+fs_vorbis_encode_f_ilv (FishSound * fsound, float ** pcm, long frames)
 {
   FishSoundVorbisInfo * fsv = (FishSoundVorbisInfo *)fsound->codec_data;
   float ** vpcm;
@@ -380,7 +380,7 @@
 }
 
 static long
-fs_vorbis_encode_n (FishSound * fsound, float * pcm[], long frames)
+fs_vorbis_encode_f (FishSound * fsound, float * pcm[], long frames)
 {
   FishSoundVorbisInfo * fsv = (FishSoundVorbisInfo *)fsound->codec_data;
   float ** vpcm;
@@ -524,8 +524,8 @@
   codec->reset = fs_vorbis_reset;
   codec->command = fs_vorbis_command;
   codec->decode = fs_vorbis_decode;
-  codec->encode_i = fs_vorbis_encode_i;
-  codec->encode_n = fs_vorbis_encode_n;
+  codec->encode_f = fs_vorbis_encode_f;
+  codec->encode_f_ilv = fs_vorbis_encode_f_ilv;
   codec->flush = NULL;
 
   return codec;


-- 
conrad