Update

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/cpp/viper/kissfft"]
-	path = src/cpp/viper/kissfft
+[submodule "src/viper/kissfft"]
+	path = src/viper/kissfft
 	url = git@github.com:mborgerding/kissfft.git

CMakeLists.txt

@@ -26,57 +26,57 @@ include_directories(src/include)
 
 set(FILES
         # Main
-        src/cpp/viper/ViPER.cpp
-        src/cpp/ViPER4Android.cpp
+        src/viper/ViPER.cpp
+        src/ViPER4Android.cpp
 
         # Effects
-        src/cpp/viper/effects/AnalogX.cpp
-        src/cpp/viper/effects/ColorfulMusic.cpp
-        src/cpp/viper/effects/Convolver.cpp
-        src/cpp/viper/effects/Cure.cpp
-        src/cpp/viper/effects/DiffSurround.cpp
-        src/cpp/viper/effects/DynamicSystem.cpp
-        src/cpp/viper/effects/FETCompressor.cpp
-        src/cpp/viper/effects/FIREqualizer.cpp
-        src/cpp/viper/effects/IIRFilter.cpp
-        src/cpp/viper/effects/PlaybackGain.cpp
-        src/cpp/viper/effects/Reverberation.cpp
-        src/cpp/viper/effects/SoftwareLimiter.cpp
-        src/cpp/viper/effects/SpeakerCorrection.cpp
-        src/cpp/viper/effects/SpectrumExtend.cpp
-        src/cpp/viper/effects/TubeSimulator.cpp
-        src/cpp/viper/effects/VHE.cpp
-        src/cpp/viper/effects/ViPERBass.cpp
-        src/cpp/viper/effects/ViPERClarity.cpp
-        src/cpp/viper/effects/ViPERDDC.cpp
+        src/viper/effects/AnalogX.cpp
+        src/viper/effects/ColorfulMusic.cpp
+        src/viper/effects/Convolver.cpp
+        src/viper/effects/Cure.cpp
+        src/viper/effects/DiffSurround.cpp
+        src/viper/effects/DynamicSystem.cpp
+        src/viper/effects/FETCompressor.cpp
+        src/viper/effects/FIREqualizer.cpp
+        src/viper/effects/IIRFilter.cpp
+        src/viper/effects/PlaybackGain.cpp
+        src/viper/effects/Reverberation.cpp
+        src/viper/effects/SoftwareLimiter.cpp
+        src/viper/effects/SpeakerCorrection.cpp
+        src/viper/effects/SpectrumExtend.cpp
+        src/viper/effects/TubeSimulator.cpp
+        src/viper/effects/VHE.cpp
+        src/viper/effects/ViPERBass.cpp
+        src/viper/effects/ViPERClarity.cpp
+        src/viper/effects/ViPERDDC.cpp
 
         # Utils
-        src/cpp/viper/utils/AdaptiveBuffer.cpp
-        src/cpp/viper/utils/Biquad.cpp
-        src/cpp/viper/utils/CAllpassFilter.cpp
-        src/cpp/viper/utils/CCombFilter.cpp
-        src/cpp/viper/utils/CRevModel.cpp
-        src/cpp/viper/utils/Crossfeed.cpp
-        src/cpp/viper/utils/DepthSurround.cpp
-        src/cpp/viper/utils/DynamicBass.cpp
-        src/cpp/viper/utils/FIR.cpp
-        src/cpp/viper/utils/Harmonic.cpp
-        src/cpp/viper/utils/HiFi.cpp
-        src/cpp/viper/utils/HighShelf.cpp
-        src/cpp/viper/utils/IIR_1st.cpp
-        src/cpp/viper/utils/IIR_NOrder_BW_BP.cpp
-        src/cpp/viper/utils/IIR_NOrder_BW_LH.cpp
-        src/cpp/viper/utils/MinPhaseIIRCoeffs.cpp
-        src/cpp/viper/utils/MultiBiquad.cpp
-        src/cpp/viper/utils/NoiseSharpening.cpp
-        src/cpp/viper/utils/PassFilter.cpp
-        src/cpp/viper/utils/PConvSingle_F32.cpp
-        src/cpp/viper/utils/PolesFilter.cpp
-        src/cpp/viper/utils/Polyphase.cpp
-        src/cpp/viper/utils/Stereo3DSurround.cpp
-        src/cpp/viper/utils/Subwoofer.cpp
-        src/cpp/viper/utils/TimeConstDelay.cpp
-        src/cpp/viper/utils/WaveBuffer.cpp)
+        src/viper/utils/AdaptiveBuffer.cpp
+        src/viper/utils/Biquad.cpp
+        src/viper/utils/CAllpassFilter.cpp
+        src/viper/utils/CCombFilter.cpp
+        src/viper/utils/CRevModel.cpp
+        src/viper/utils/Crossfeed.cpp
+        src/viper/utils/DepthSurround.cpp
+        src/viper/utils/DynamicBass.cpp
+        src/viper/utils/FIR.cpp
+        src/viper/utils/Harmonic.cpp
+        src/viper/utils/HiFi.cpp
+        src/viper/utils/HighShelf.cpp
+        src/viper/utils/IIR_1st.cpp
+        src/viper/utils/IIR_NOrder_BW_BP.cpp
+        src/viper/utils/IIR_NOrder_BW_LH.cpp
+        src/viper/utils/MinPhaseIIRCoeffs.cpp
+        src/viper/utils/MultiBiquad.cpp
+        src/viper/utils/NoiseSharpening.cpp
+        src/viper/utils/PassFilter.cpp
+        src/viper/utils/PConvSingle_F32.cpp
+        src/viper/utils/PolesFilter.cpp
+        src/viper/utils/Polyphase.cpp
+        src/viper/utils/Stereo3DSurround.cpp
+        src/viper/utils/Subwoofer.cpp
+        src/viper/utils/TimeConstDelay.cpp
+        src/viper/utils/WaveBuffer.cpp)
 
 message(${CMAKE_BUILD_TYPE})
 

src/cpp/viper/kissfft

@@ -1 +0,0 @@
-Subproject commit 8f47a67f595a6641c566087bf5277034be64f24d

src/main/AndroidManifest.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aam.v4afx_r"
-    android:versionCode="1"
-    android:versionName="1.0">
-</manifest>