ref: ae1941edd7045fe0722e77e452dabb29cd0ecb02
parent: 99bd519a4df4601f868f2bd601d958f6f631d1d2
author: menno <menno>
date: Thu Jul 25 08:30:57 EDT 2002
made aacDECdrop compilable again
--- a/aacDECdrop/audio.c
+++ b/aacDECdrop/audio.c
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: audio.c,v 1.2 2002/04/14 16:31:02 menno Exp $
+** $Id: audio.c,v 1.3 2002/07/25 12:30:57 menno Exp $
**/
#include <fcntl.h>
@@ -36,19 +36,15 @@
switch (outputFormat)
{case FAAD_FMT_16BIT:
- aufile->sfinfo.pcmbitwidth = 16;
- aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_PCM);
+ aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_PCM_16);
break;
case FAAD_FMT_24BIT:
- aufile->sfinfo.pcmbitwidth = 24;
- aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_PCM);
+ aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_PCM_24);
break;
case FAAD_FMT_32BIT:
- aufile->sfinfo.pcmbitwidth = 32;
- aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_PCM);
+ aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_PCM_32);
break;
case FAAD_FMT_FLOAT:
- aufile->sfinfo.pcmbitwidth = 32;
aufile->sfinfo.format = ((1<<(fileType+15)) | SF_FORMAT_FLOAT);
break;
}
@@ -55,7 +51,7 @@
aufile->sfinfo.channels = channels;
aufile->sfinfo.samples = 0;
- aufile->sndfile = sf_open_write(infile, &aufile->sfinfo);
+ aufile->sndfile = sf_open(infile, SFM_WRITE, &aufile->sfinfo);
if (aufile->sndfile == NULL)
{--- a/aacDECdrop/decode.c
+++ b/aacDECdrop/decode.c
@@ -16,8 +16,8 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: decode.c,v 1.3 2002/05/30 18:01:37 menno Exp $
-** $Id: decode.c,v 1.3 2002/05/30 18:01:37 menno Exp $
+** $Id: decode.c,v 1.4 2002/07/25 12:30:57 menno Exp $
+** $Id: decode.c,v 1.4 2002/07/25 12:30:57 menno Exp $
**/
#ifdef _WIN32
@@ -284,7 +284,7 @@
if (buff)
{rc = AudioSpecificConfig(buff, &dummy32, &dummy8, &dummy8, &dummy8,
- &dummy8, &dummy8, &dummy8);
+ &dummy8, &dummy8, &dummy8, &dummy8);
free(buff);
if (rc < 0)