rename files

libs/celt/cc6_kiss_fftr.h

@@ -19,7 +19,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #ifndef KISS_FTR_H
 #define KISS_FTR_H
 
-#include "kiss_fft.h"
+#include "cc6_kiss_fft.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

libs/celt/cc6_laplace.c

@@ -33,7 +33,7 @@
 #include "config.h"
 #endif
 
-#include "laplace.h"
+#include "cc6_laplace.h"
 
 int ec_laplace_get_start_freq(int decay)
 {

libs/celt/cc6_mdct.c

@@ -46,11 +46,11 @@
 #include "config.h"
 #endif
 
-#include "mdct.h"
+#include "cc6_mdct.h"
 #include "cc6_kfft_double.h"
 #include <math.h>
 #include "cc6_os_support.h"
-#include "mathops.h"
+#include "cc6_mathops.h"
 #include "cc6_stack_alloc.h"
 
 #ifndef M_PI

libs/celt/cc6_mdct.h

@@ -45,7 +45,7 @@
 #ifndef MDCT_H
 #define MDCT_H
 
-#include "kiss_fft.h"
+#include "cc6_kiss_fft.h"
 #include "cc6_arch.h"
 
 typedef struct {

libs/celt/cc6_modes.c

@@ -34,11 +34,11 @@
 #endif
 
 #include "cc6_celt.h"
-#include "modes.h"
+#include "cc6_modes.h"
-#include "rate.h"
+#include "cc6_rate.h"
-#include "os_support.h"
+#include "cc6_os_support.h"
-#include "stack_alloc.h"
+#include "cc6_stack_alloc.h"
-#include "quant_bands.h"
+#include "cc6_quant_bands.h"
 
 #ifdef STATIC_MODES
 #include "static_modes.c"

libs/celt/cc6_modes.h

@@ -35,9 +35,9 @@
 #include "cc6_celt_types.h"
 #include "cc6_celt.h"
 #include "cc6_arch.h"
-#include "mdct.h"
+#include "cc6_mdct.h"
-#include "psy.h"
+#include "cc6_psy.h"
-#include "pitch.h"
+#include "cc6_pitch.h"
 
 #define CELT_BITSTREAM_VERSION 0x80000009
 

libs/celt/cc6_pitch.c

@@ -43,10 +43,10 @@
 #include "kiss_fftr.h"*/
 #include "cc6_kfft_single.h"
 
-#include "pitch.h"
+#include "cc6_pitch.h"
-#include "psy.h"
+#include "cc6_psy.h"
-#include "os_support.h"
+#include "cc6_os_support.h"
-#include "mathops.h"
+#include "cc6_mathops.h"
 #include "cc6_modes.h"
 #include "cc6_stack_alloc.h"
 

libs/celt/cc6_pitch.h

@@ -38,8 +38,8 @@
 #ifndef _PITCH_H
 #define _PITCH_H
 
-#include "kiss_fftr.h"
+#include "cc6_kiss_fftr.h"
-#include "psy.h"
+#include "cc6_psy.h"
 #include "cc6_modes.h"
 
 kiss_fftr_cfg pitch_state_alloc(int max_lag);

libs/celt/cc6_psy.c

@@ -33,12 +33,12 @@
 #include "config.h"
 #endif
 
-#include "psy.h"
+#include "cc6_psy.h"
 #include <math.h>
-#include "os_support.h"
+#include "cc6_os_support.h"
 #include "cc6_arch.h"
 #include "cc6_stack_alloc.h"
-#include "mathops.h"
+#include "cc6_mathops.h"
 
 /* The Vorbis freq<->Bark mapping */
 #define toBARK(n)   (13.1f*atan(.00074f*(n))+2.24f*atan((n)*(n)*1.85e-8f)+1e-4f*(n))

libs/celt/cc6_quant_bands.c

@@ -33,12 +33,12 @@
 #include "config.h"
 #endif
 
-#include "quant_bands.h"
+#include "cc6_quant_bands.h"
-#include "laplace.h"
+#include "cc6_laplace.h"
 #include <math.h>
-#include "os_support.h"
+#include "cc6_os_support.h"
 #include "cc6_arch.h"
-#include "mathops.h"
+#include "cc6_mathops.h"
 #include "cc6_stack_alloc.h"
 
 #ifdef FIXED_POINT

libs/celt/cc6_quant_bands.h

@@ -36,7 +36,7 @@
 #include "cc6_modes.h"
 #include "cc6_entenc.h"
 #include "cc6_entdec.h"
-#include "mathops.h"
+#include "cc6_mathops.h"
 
 static __inline celt_word16_t amp2Log(celt_word32_t amp)
 {

libs/celt/cc6_rate.c

@@ -37,10 +37,10 @@
 #include "cc6_modes.h"
 #include "cc6_cwrs.h"
 #include "cc6_arch.h"
-#include "os_support.h"
+#include "cc6_os_support.h"
 
 #include "cc6_entcode.h"
-#include "rate.h"
+#include "cc6_rate.h"
 
 
 #ifndef STATIC_MODES

libs/celt/cc6_vq.c

@@ -33,11 +33,11 @@
 #include "config.h"
 #endif
 
-#include "mathops.h"
+#include "cc6_mathops.h"
 #include "cc6_cwrs.h"
-#include "vq.h"
+#include "cc6_vq.h"
 #include "cc6_arch.h"
-#include "os_support.h"
+#include "cc6_os_support.h"
 
 /** Takes the pitch vector and the decoded residual vector, computes the gain
     that will give ||p+g*y||=1 and mixes the residual with the pitch. */

libs/celt/cc6_vq.h

@@ -38,7 +38,7 @@
 
 #include "cc6_entenc.h"
 #include "cc6_entdec.h"
-#include "modes.h"
+#include "cc6_modes.h"
 
 /** Algebraic pulse-vector quantiser. The signal x is replaced by the sum of 
   * the pitch and a combination of pulses such that its norm is still equal 

llcon.pro

@@ -112,20 +112,20 @@ HEADERS += src/audiomixerboard.h \
     libs/celt/cc6_float_cast.h \
     libs/celt/cc6_kfft_double.h \
     libs/celt/cc6_kfft_single.h \
-    libs/celt/kiss_fft.h \
+    libs/celt/cc6_kiss_fft.h \
-    libs/celt/kiss_fftr.h \
+    libs/celt/cc6_kiss_fftr.h \
-    libs/celt/laplace.h \
+    libs/celt/cc6_laplace.h \
-    libs/celt/mdct.h \
+    libs/celt/cc6_mdct.h \
-    libs/celt/mfrngcod.h \
+    libs/celt/cc6_mfrngcod.h \
-    libs/celt/mathops.h \
+    libs/celt/cc6_mathops.h \
-    libs/celt/modes.h \
+    libs/celt/cc6_modes.h \
-    libs/celt/os_support.h \
+    libs/celt/cc6_os_support.h \
-    libs/celt/pitch.h \
+    libs/celt/cc6_pitch.h \
-    libs/celt/psy.h \
+    libs/celt/cc6_psy.h \
-    libs/celt/quant_bands.h \
+    libs/celt/cc6_quant_bands.h \
-    libs/celt/rate.h \
+    libs/celt/cc6_rate.h \
-    libs/celt/stack_alloc.h \
+    libs/celt/cc6_stack_alloc.h \
-    libs/celt/vq.h
+    libs/celt/cc6_vq.h
 
 SOURCES += src/audiomixerboard.cpp \
     src/buffer.cpp \
@@ -157,16 +157,16 @@ SOURCES += src/audiomixerboard.cpp \
     libs/celt/cc6_kfft_single.c \
     libs/celt/cc6__kiss_fft.c \
     libs/celt/cc6__kiss_fftr.c \
-    libs/celt/laplace.c \
+    libs/celt/cc6_laplace.c \
-    libs/celt/mdct.c \
+    libs/celt/cc6_mdct.c \
-    libs/celt/modes.c \
+    libs/celt/cc6_modes.c \
-    libs/celt/pitch.c \
+    libs/celt/cc6_pitch.c \
-    libs/celt/psy.c \
+    libs/celt/cc6_psy.c \
-    libs/celt/quant_bands.c \
+    libs/celt/cc6_quant_bands.c \
-    libs/celt/rangedec.c \
+    libs/celt/cc6_rangedec.c \
-    libs/celt/rangeenc.c \
+    libs/celt/cc6_rangeenc.c \
-    libs/celt/rate.c \
+    libs/celt/cc6_rate.c \
-    libs/celt/vq.c
+    libs/celt/cc6_vq.c
 
 DISTFILES += AUTHORS \
     ChangeLog \