renamed fdk-aac to fdk-aac-dab

kit-cel · Aug 21, 2017 · 6cc35df · 6cc35df
1 parent 0e26c87
commit 6cc35df
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 33 deletions.
diff --git a/fdk-aac-dab/.gitignore b/fdk-aac-dab/.gitignore
@@ -9,7 +9,7 @@ Makefile.in
 aclocal.m4
 autom4te.cache
 configure
-fdk-aac.pc
+fdk-aac-dab.pc
 config.guess
 config.log
 config.status

diff --git a/fdk-aac-dab/Makefile.am b/fdk-aac-dab/Makefile.am
@@ -13,30 +13,30 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/libPCMutils/include
 
 AM_CXXFLAGS = -fno-exceptions -fno-rtti
-libfdk_aac_la_LINK = $(LINK) $(libfdk_aac_la_LDFLAGS)
+libfdk_aac_dab_la_LINK = $(LINK) $(libfdk_aac_dab_la_LDFLAGS)
 # Mention a dummy pure C file to trigger generation of the $(LINK) variable
-nodist_EXTRA_libfdk_aac_la_SOURCES = dummy.c
+nodist_EXTRA_libfdk_aac_dab_la_SOURCES = dummy.c
 
-fdk_aacincludedir = $(includedir)/fdk-aac
-fdk_aacinclude_HEADERS = \
+fdk_aac_dabincludedir = $(includedir)/fdk-aac-dab
+fdk_aac_dabinclude_HEADERS = \
     $(top_srcdir)/libSYS/include/machine_type.h \
     $(top_srcdir)/libSYS/include/genericStds.h \
     $(top_srcdir)/libSYS/include/FDK_audio.h \
     $(top_srcdir)/libAACenc/include/aacenc_lib.h \
     $(top_srcdir)/libAACdec/include/aacdecoder_lib.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = fdk-aac.pc
+pkgconfig_DATA = fdk-aac-dab.pc
 
-lib_LTLIBRARIES = libfdk-aac.la
+lib_LTLIBRARIES = libfdk-aac-dab.la
 
-libfdk_aac_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \
-    -export-symbols $(top_srcdir)/fdk-aac.sym
+libfdk_aac_dab_la_LDFLAGS = -version-info @FDK_AAC_DAB_VERSION@ -no-undefined \
+    -export-symbols $(top_srcdir)/fdk-aac-dab.sym
 
 if EXAMPLE
 bin_PROGRAMS = aac-enc$(EXEEXT)
 
-aac_enc_LDADD = libfdk-aac.la
+aac_enc_LDADD = libfdk-aac-dab.la
 aac_enc_SOURCES = aac-enc.c wavreader.c
 
 noinst_HEADERS = wavreader.h
@@ -179,7 +179,7 @@ SYS_SRC = \
     libSYS/src/genericStds.cpp \
     libSYS/src/wav_file.cpp
 
-libfdk_aac_la_SOURCES = \
+libfdk_aac_dab_la_SOURCES = \
     $(AACDEC_SRC) $(AACENC_SRC) \
     $(MPEGTPDEC_SRC) $(MPEGTPENC_SRC) \
     $(SBRDEC_SRC) $(SBRENC_SRC) \
@@ -190,7 +190,7 @@ EXTRA_DIST = \
     $(top_srcdir)/MODULE_LICENSE_FRAUNHOFER \
     $(top_srcdir)/NOTICE \
     $(top_srcdir)/Android.mk \
-    $(top_srcdir)/fdk-aac.sym \
+    $(top_srcdir)/fdk-aac-dab.sym \
     $(top_srcdir)/Makefile.vc \
     $(top_srcdir)/documentation/*.pdf \
     $(top_srcdir)/libAACdec/src/*.h \

diff --git a/fdk-aac-dab/Makefile.vc b/fdk-aac-dab/Makefile.vc
@@ -165,7 +165,7 @@ SYS_SRC = \
     libSYS/src/genericStds.cpp \
     libSYS/src/wav_file.cpp
 
-libfdk_aac_SOURCES = \
+libfdk_aac_dab_SOURCES = \
     $(AACDEC_SRC) $(AACENC_SRC) \
     $(MPEGTPDEC_SRC) $(MPEGTPENC_SRC) \
     $(SBRDEC_SRC) $(SBRENC_SRC) \
@@ -183,19 +183,19 @@ CPPFLAGS = $(CFLAGS)
 LDFLAGS  = -nologo $(XLDFLAGS)
 ARFLAGS  = -nologo
 
-incdir = $(prefix_win)\include\fdk-aac
+incdir = $(prefix_win)\include\fdk-aac-dab
 bindir = $(prefix_win)\bin
 libdir = $(prefix_win)\lib
 
 INST_DIRS = $(bindir) $(incdir) $(libdir)
 
-LIB_DEF    = fdk-aac.def
-STATIC_LIB = fdk-aac.lib
-SHARED_LIB = fdk-aac-1.dll
-IMP_LIB    = fdk-aac.dll.lib
+LIB_DEF    = fdk-aac-dab.def
+STATIC_LIB = fdk-aac-dab.lib
+SHARED_LIB = fdk-aac-dab-1.dll
+IMP_LIB    = fdk-aac-dab.dll.lib
 
 AAC_ENC_OBJS = $(aac_enc_SOURCES:.c=.obj)
-FDK_OBJS     = $(libfdk_aac_SOURCES:.cpp=.obj)
+FDK_OBJS     = $(libfdk_aac_dab_SOURCES:.cpp=.obj)
 
 PROGS = aac-enc.exe
 
@@ -204,7 +204,7 @@ PROGS = aac-enc.exe
 all: $(LIB_DEF) $(STATIC_LIB) $(SHARED_LIB) $(IMP_LIB) $(PROGS)
 
 clean:
-	del /f $(LIB_DEF) $(STATIC_LIB) $(SHARED_LIB) $(IMP_LIB) $(PROGS) libfdk-aac.pc 2>NUL
+	del /f $(LIB_DEF) $(STATIC_LIB) $(SHARED_LIB) $(IMP_LIB) $(PROGS) libfdk-aac-dab.pc 2>NUL
 	del /f *.obj *.exp 2>NUL
 	del /f libAACdec\src\*.obj 2>NUL
 	del /f libAACenc\src\*.obj 2>NUL
@@ -247,4 +247,4 @@ $(PROGS): $(AAC_ENC_OBJS)
 
 $(LIB_DEF):
 	@echo EXPORTS > $(LIB_DEF)
-	@type fdk-aac.sym >> $(LIB_DEF)
+	@type fdk-aac-dab.sym >> $(LIB_DEF)
diff --git a/fdk-aac-dab/README.md b/fdk-aac-dab/README.md
@@ -1,7 +1,7 @@
-A patched version of fdk-aac with DAB+ support
+A patched version of fdk-aac-dab with DAB+ support
 ==============================================
 
-This is a modified version of fdk-aac that supports the AOTs
+This is a modified version of fdk-aac-dab that supports the AOTs
 required for DAB+ encoding.
 
 This library is a dependency for ODR-AudioEnc.

diff --git a/fdk-aac-dab/configure.ac b/fdk-aac-dab/configure.ac
@@ -1,7 +1,7 @@
 dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([fdk-aac], [0.1.5], [http://sourceforge.net/projects/opencore-amr/])
+AC_INIT([fdk-aac-dab], [0.1.5], [http://sourceforge.net/projects/opencore-amr/])
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([tar-ustar foreign])
@@ -26,13 +26,13 @@ AC_SEARCH_LIBS([sin], [m])
 dnl soname version to use
 dnl goes by ‘current[:revision[:age]]’ with the soname ending up as
 dnl current.age.revision
-FDK_AAC_VERSION=1:0:0
+FDK_AAC_DAB_VERSION=1:0:0
 
 AS_IF([test x$enable_shared = xyes], [LIBS_PRIVATE=$LIBS], [LIBS_PUBLIC=$LIBS])
-AC_SUBST(FDK_AAC_VERSION)
+AC_SUBST(FDK_AAC_DAB_VERSION)
 AC_SUBST(LIBS_PUBLIC)
 AC_SUBST(LIBS_PRIVATE)
 
 AC_CONFIG_FILES([Makefile
-                 fdk-aac.pc])
+                 fdk-aac-dab.pc])
 AC_OUTPUT
diff --git a/fdk-aac-dab/fdk-aac.pc.in → fdk-aac-dab/fdk-aac-dab.pc.in b/fdk-aac-dab/fdk-aac.pc.in → fdk-aac-dab/fdk-aac-dab.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Fraunhofer FDK AAC Codec Library
 Description: AAC codec library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lfdk-aac @LIBS_PUBLIC@
+Libs: -L${libdir} -lfdk-aac-dab @LIBS_PUBLIC@
 Libs.private: @LIBS_PRIVATE@
 Cflags: -I${includedir}
diff --git a/fdk-aac-dab/fdk-aac.sym → fdk-aac-dab/fdk-aac-dab.sym b/fdk-aac-dab/fdk-aac.sym → fdk-aac-dab/fdk-aac-dab.sym
diff --git a/fdk-aac-dab/libAACdec/src/aacdecoder_lib.cpp b/fdk-aac-dab/libAACdec/src/aacdecoder_lib.cpp
@@ -1123,7 +1123,7 @@ LINKSPEC_CPP INT aacDecoder_GetLibInfo ( LIB_INFO *info )
   }
   info += i;
 
-  info->module_id = FDK_AACDEC;
+  info->module_id = FDK_AAC_DABDEC;
   /* build own library info */
   info->version = LIB_VERSION(AACDECODER_LIB_VL0, AACDECODER_LIB_VL1, AACDECODER_LIB_VL2);
   LIB_VERSION_STRING(info);

diff --git a/fdk-aac-dab/libAACenc/src/aacenc_lib.cpp b/fdk-aac-dab/libAACenc/src/aacenc_lib.cpp
@@ -1803,7 +1803,7 @@ AACENC_ERROR aacEncGetLibInfo(LIB_INFO *info)
     return AACENC_INIT_ERROR;
   }
 
-  info[i].module_id = FDK_AACENC;
+  info[i].module_id = FDK_AAC_DABENC;
   info[i].build_date = (char*)AACENCODER_LIB_BUILD_DATE;
   info[i].build_time = (char*)AACENCODER_LIB_BUILD_TIME;
   info[i].title = (char*)AACENCODER_LIB_TITLE;

diff --git a/fdk-aac-dab/libSYS/include/FDK_audio.h b/fdk-aac-dab/libSYS/include/FDK_audio.h
@@ -427,8 +427,8 @@ typedef enum {
   FDK_NONE   = 0,
   FDK_TOOLS  = 1,
   FDK_SYSLIB = 2,
-  FDK_AACDEC = 3,
-  FDK_AACENC = 4,
+  FDK_AAC_DABDEC = 3,
+  FDK_AAC_DABENC = 4,
   FDK_SBRDEC = 5,
   FDK_SBRENC = 6,
   FDK_TPDEC  = 7,
@@ -441,7 +441,7 @@ typedef enum {
   FDK_DABPARSE = 14,
   FDK_DRMDEC = 15,
   FDK_DRMPARSE = 16,
-  FDK_AACLDENC = 17,
+  FDK_AAC_DABLDENC = 17,
   FDK_MP2ENC = 18,
   FDK_MP3ENC = 19,
   FDK_MP3DEC = 20,