ref: a3eafe9ed6aa5c906c00c8b9586fcafae82d4e7a
parent: 63f943c97e2b086dd680ec73ae97e2bffe777eb1
author: menno <menno>
date: Mon Jul 2 03:37:18 EDT 2001
Fixes for compiling CoolEdit filter
--- a/cooledit/faac.c
+++ b/cooledit/faac.c
@@ -2,7 +2,7 @@
#include <stdio.h> // for FILE *
#include "filters.h" //CoolEdit
#include "resource.h"
-#include "faac.h"
+#include <faac.h>
static faacEncHandle hEncoder;
faacEncConfiguration faacEncCfg;
--- a/cooledit/faac.h
+++ /dev/null
@@ -1,107 +1,0 @@
-/*
- * FAAC - Freeware Advanced Audio Coder
- * Copyright (C) 2001 Menno Bakker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * $Id: faac.h,v 1.1 2001/07/02 07:26:01 menno Exp $
- */
-
-#ifndef FAACLIB_H
-#define FAACLIB_H
-
-#ifdef __cplusplus
-extern "C" {-#endif /* __cplusplus */
-
-#ifdef WIN32
- #pragma pack(push, 8)
- #ifndef FAACAPI
- #define FAACAPI __stdcall
- #endif
-#else
- #ifndef FAACAPI
- #define FAACAPI
- #endif
-#endif
-
-#define FAACENC_VERSION 1.5
-#define FAACENC_VERSIONB 0 /* If 1 this version is still in beta */
-
-/* MPEG ID's */
-#define MPEG2 1
-#define MPEG4 0
-
-/* AAC object types */
-#define MAIN 0
-#define LOW 1
-#define SSR 2
-#define LTP 3
-
-typedef struct faacEncConfiguration
-{- /* MPEG version, 2 or 4 */
- unsigned int mpegVersion;
-
- /* AAC object type */
- unsigned int aacObjectType;
-
- /* Allow mid/side coding */
- unsigned int allowMidside;
-
- /* Use one of the channels as LFE channel */
- unsigned int useLfe;
-
- /* Use Temporal Noise Shaping */
- unsigned int useTns;
-
- /* bitrate / channel of AAC file */
- unsigned long bitRate;
-
- /* AAC file frequency bandwidth */
- unsigned int bandWidth;
-
-} faacEncConfiguration, *faacEncConfigurationPtr;
-
-typedef void *faacEncHandle;
-
-
-faacEncConfigurationPtr FAACAPI faacEncGetCurrentConfiguration(faacEncHandle hEncoder);
-int FAACAPI faacEncSetConfiguration (faacEncHandle hEncoder, faacEncConfigurationPtr config);
-
-faacEncHandle FAACAPI faacEncOpen(unsigned long sampleRate,
- unsigned int numChannels,
- unsigned long *inputSamples,
- unsigned long *maxOutputBytes);
-
-int FAACAPI faacEncEncode(faacEncHandle hEncoder,
- short *inputBuffer,
- unsigned int samplesInput,
- void *outputBuffer,
- unsigned int bufferSize
- );
-
-int FAACAPI faacEncClose(faacEncHandle hEncoder);
-
-
-#ifdef WIN32
- #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* FAACLIB_H */
\ No newline at end of file
--- a/cooledit/faacflt.dsp
+++ b/cooledit/faacflt.dsp
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../include" /I "../../faad/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x413 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libfaac/include" /I "../../faad/libfaad/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x413 /d "_DEBUG"
@@ -113,14 +113,6 @@
# Begin Source File
SOURCE=.\AACINFO.H
-# End Source File
-# Begin Source File
-
-SOURCE=.\FAAC.H
-# End Source File
-# Begin Source File
-
-SOURCE=.\FAAD.H
# End Source File
# Begin Source File
--- a/cooledit/faad.c
+++ b/cooledit/faad.c
@@ -4,7 +4,7 @@
#include "filters.h" //CoolEdit
#include "resource.h"
-#include "faad.h"
+#include <faad.h>
#include "aacinfo.h"
--- a/cooledit/faad.h
+++ /dev/null
@@ -1,84 +1,0 @@
-/*
- * FAAD - Freeware Advanced Audio Decoder
- * Copyright (C) 2001 Menno Bakker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * $Id: faad.h,v 1.1 2001/07/02 07:26:01 menno Exp $
- */
-
-#ifndef _AACDEC_H
-#define _AACDEC_H
-
-#ifdef __cplusplus
-extern "C" {-#endif /* __cplusplus */
-
-#ifdef WIN32
- #pragma pack(push, 8)
- #ifndef FAADAPI
- #define FAADAPI __stdcall
- #endif
-#else
- #ifndef FAADAPI
- #define FAADAPI
- #endif
-#endif
-
-#define FAAD_OK 0
-#define FAAD_OK_CHUPDATE 1
-#define FAAD_ERROR 2
-#define FAAD_FATAL_ERROR 3
-
-typedef void *faacDecHandle;
-typedef void *faacProgConfig;
-
-typedef struct faacDecConfiguration
-{- unsigned int dummy;
-} faacDecConfiguration, *faacDecConfigurationPtr;
-
-
-faacDecHandle FAADAPI faacDecOpen();
-
-faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder);
-
-int FAADAPI faacDecSetConfiguration(faacDecHandle hDecoder,
- faacDecConfigurationPtr config);
-
-int FAADAPI faacDecInit(faacDecHandle hDecoder,
- unsigned char *buffer,
- unsigned long *samplerate,
- unsigned long *channels);
-
-int FAADAPI faacDecGetProgConfig(faacDecHandle hDecoder,
- faacProgConfig *progConfig);
-
-int FAADAPI faacDecDecode(faacDecHandle hDecoder,
- unsigned char *buffer,
- unsigned long *bytesconsumed,
- short *sample_buffer);
-
-void FAADAPI faacDecClose(faacDecHandle hDecoder);
-
-#endif
-
-#ifdef WIN32
- #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */