Moved kiss_fft to the lib/ directory

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d26352fca094c8ac30c6724102951272f0be43b6..444996dc96481c9c43a0732c031394eb073db201 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,7 +87,6 @@ add_subdirectory(lib)
 add_subdirectory(projecttree)
 add_subdirectory(utils)
 add_subdirectory(databackup)
-add_subdirectory(kiss_fft)
 add_subdirectory(lib)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)

diff --git a/src/audioscopes/audiospectrum.cpp b/src/audioscopes/audiospectrum.cpp
index be40af7ab57504fbc284be771bf794958a02b588..60a9091d5b3a938d01b1f24947650b94ef56cc71 100644 (file)
--- a/src/audioscopes/audiospectrum.cpp
+++ b/src/audioscopes/audiospectrum.cpp
@@ -12,7 +12,7 @@
 
 #include "audiospectrum.h"
 #include "ffttools.h"
-#include "kiss_fft/tools/kiss_fftr.h"
+#include "lib/external/kiss_fft/tools/kiss_fftr.h"
 
 #include <QMenu>
 #include <QPainter>

diff --git a/src/audioscopes/audiospectrum.h b/src/audioscopes/audiospectrum.h
index 77308afa98e21f50cb1fb208ed708c9c39694c81..f8a3b5968094915f29cc56fa6122076093c50f87 100644 (file)
--- a/src/audioscopes/audiospectrum.h
+++ b/src/audioscopes/audiospectrum.h
@@ -29,7 +29,7 @@
 
 #include "abstractaudioscopewidget.h"
 #include "ui_audiospectrum_ui.h"
-#include "kiss_fft/tools/kiss_fftr.h"
+#include "lib/external/kiss_fft/tools/kiss_fftr.h"
 #include "ffttools.h"
 
 class AudioSpectrum_UI;

diff --git a/src/audioscopes/ffttools.h b/src/audioscopes/ffttools.h
index 26cee848288bfcca5015de29da86389d50bc8182..f6a3665e5c02813e57f2f2989e4da0ead8bdaf96 100644 (file)
--- a/src/audioscopes/ffttools.h
+++ b/src/audioscopes/ffttools.h
@@ -13,7 +13,7 @@
 
 #include <QVector>
 #include <QHash>
-#include "kiss_fft/tools/kiss_fftr.h"
+#include "lib/external/kiss_fft/tools/kiss_fftr.h"
 
 class FFTTools
 {

diff --git a/src/kiss_fft/CMakeLists.txt b/src/kiss_fft/CMakeLists.txt
deleted file mode 100644 (file)
index 51288bf..0000000
--- a/src/kiss_fft/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(kdenlive_SRCS
-  ${kdenlive_SRCS}
-  kiss_fft/_kiss_fft_guts.h
-  kiss_fft/kiss_fft.c
-  kiss_fft/tools/kiss_fftr.c
-  PARENT_SCOPE
-)

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index fe191f38e369c5dd0bdb95c523b10c28b0d120f8..fcb0aade9703eb6dbf7dc45ceeebc816ac5303f9 100644 (file)
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 add_subdirectory(audio)
+add_subdirectory(external)
 
 # Hack. kdenlive_SRCS is defined in the sub-scope and added to this scope;
 # now we again need to add it to the parent scope.

diff --git a/src/lib/external/CMakeLists.txt b/src/lib/external/CMakeLists.txt
new file mode 100644 (file)
index 0000000..978e5a6
--- /dev/null
+++ b/src/lib/external/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+add_subdirectory(kiss_fft)
+
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  PARENT_SCOPE
+)

diff --git a/src/kiss_fft/CHANGELOG b/src/lib/external/kiss_fft/CHANGELOG
similarity index 100%
rename from src/kiss_fft/CHANGELOG
rename to src/lib/external/kiss_fft/CHANGELOG

diff --git a/src/lib/external/kiss_fft/CMakeLists.txt b/src/lib/external/kiss_fft/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9b9b064
--- /dev/null
+++ b/src/lib/external/kiss_fft/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  lib/external/kiss_fft/_kiss_fft_guts.h
+  lib/external/kiss_fft/kiss_fft.c
+  lib/external/kiss_fft/tools/kiss_fftr.c
+  PARENT_SCOPE
+)

diff --git a/src/kiss_fft/COPYING b/src/lib/external/kiss_fft/COPYING
similarity index 100%
rename from src/kiss_fft/COPYING
rename to src/lib/external/kiss_fft/COPYING

diff --git a/src/kiss_fft/README b/src/lib/external/kiss_fft/README
similarity index 100%
rename from src/kiss_fft/README
rename to src/lib/external/kiss_fft/README

diff --git a/src/kiss_fft/README.simd b/src/lib/external/kiss_fft/README.simd
similarity index 100%
rename from src/kiss_fft/README.simd
rename to src/lib/external/kiss_fft/README.simd

diff --git a/src/kiss_fft/TIPS b/src/lib/external/kiss_fft/TIPS
similarity index 100%
rename from src/kiss_fft/TIPS
rename to src/lib/external/kiss_fft/TIPS

diff --git a/src/kiss_fft/_kiss_fft_guts.h b/src/lib/external/kiss_fft/_kiss_fft_guts.h
similarity index 100%
rename from src/kiss_fft/_kiss_fft_guts.h
rename to src/lib/external/kiss_fft/_kiss_fft_guts.h

diff --git a/src/kiss_fft/kiss_fft.c b/src/lib/external/kiss_fft/kiss_fft.c
similarity index 100%
rename from src/kiss_fft/kiss_fft.c
rename to src/lib/external/kiss_fft/kiss_fft.c

diff --git a/src/kiss_fft/kiss_fft.h b/src/lib/external/kiss_fft/kiss_fft.h
similarity index 100%
rename from src/kiss_fft/kiss_fft.h
rename to src/lib/external/kiss_fft/kiss_fft.h

diff --git a/src/kiss_fft/kissfft.hh b/src/lib/external/kiss_fft/kissfft.hh
similarity index 100%
rename from src/kiss_fft/kissfft.hh
rename to src/lib/external/kiss_fft/kissfft.hh

diff --git a/src/kiss_fft/tools/Makefile b/src/lib/external/kiss_fft/tools/Makefile
similarity index 100%
rename from src/kiss_fft/tools/Makefile
rename to src/lib/external/kiss_fft/tools/Makefile

diff --git a/src/kiss_fft/tools/fftutil.c b/src/lib/external/kiss_fft/tools/fftutil.c
similarity index 100%
rename from src/kiss_fft/tools/fftutil.c
rename to src/lib/external/kiss_fft/tools/fftutil.c

diff --git a/src/kiss_fft/tools/kfc.c b/src/lib/external/kiss_fft/tools/kfc.c
similarity index 100%
rename from src/kiss_fft/tools/kfc.c
rename to src/lib/external/kiss_fft/tools/kfc.c

diff --git a/src/kiss_fft/tools/kfc.h b/src/lib/external/kiss_fft/tools/kfc.h
similarity index 100%
rename from src/kiss_fft/tools/kfc.h
rename to src/lib/external/kiss_fft/tools/kfc.h

diff --git a/src/kiss_fft/tools/kiss_fastfir.c b/src/lib/external/kiss_fft/tools/kiss_fastfir.c
similarity index 100%
rename from src/kiss_fft/tools/kiss_fastfir.c
rename to src/lib/external/kiss_fft/tools/kiss_fastfir.c

diff --git a/src/kiss_fft/tools/kiss_fftnd.c b/src/lib/external/kiss_fft/tools/kiss_fftnd.c
similarity index 100%
rename from src/kiss_fft/tools/kiss_fftnd.c
rename to src/lib/external/kiss_fft/tools/kiss_fftnd.c

diff --git a/src/kiss_fft/tools/kiss_fftnd.h b/src/lib/external/kiss_fft/tools/kiss_fftnd.h
similarity index 100%
rename from src/kiss_fft/tools/kiss_fftnd.h
rename to src/lib/external/kiss_fft/tools/kiss_fftnd.h

diff --git a/src/kiss_fft/tools/kiss_fftndr.c b/src/lib/external/kiss_fft/tools/kiss_fftndr.c
similarity index 100%
rename from src/kiss_fft/tools/kiss_fftndr.c
rename to src/lib/external/kiss_fft/tools/kiss_fftndr.c

diff --git a/src/kiss_fft/tools/kiss_fftndr.h b/src/lib/external/kiss_fft/tools/kiss_fftndr.h
similarity index 100%
rename from src/kiss_fft/tools/kiss_fftndr.h
rename to src/lib/external/kiss_fft/tools/kiss_fftndr.h

diff --git a/src/kiss_fft/tools/kiss_fftr.c b/src/lib/external/kiss_fft/tools/kiss_fftr.c
similarity index 100%
rename from src/kiss_fft/tools/kiss_fftr.c
rename to src/lib/external/kiss_fft/tools/kiss_fftr.c

diff --git a/src/kiss_fft/tools/kiss_fftr.h b/src/lib/external/kiss_fft/tools/kiss_fftr.h
similarity index 100%
rename from src/kiss_fft/tools/kiss_fftr.h
rename to src/lib/external/kiss_fft/tools/kiss_fftr.h

diff --git a/src/kiss_fft/tools/psdpng.c b/src/lib/external/kiss_fft/tools/psdpng.c
similarity index 100%
rename from src/kiss_fft/tools/psdpng.c
rename to src/lib/external/kiss_fft/tools/psdpng.c