Source folder cleanup

2014-11-17 21:29:27 -05:00 · 2014-11-17 21:29:27 -05:00 · 532968a818
parent 6638f07b12
commit 532968a818
25 changed files with 31 additions and 27 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -84,19 +84,19 @@ endif (DEFINED WIN32)

 SET (cubicsdr_sources
    src/CubicSDR.cpp
-	src/SDRThread.cpp
-	src/PrimaryGLContext.cpp
 	src/AppFrame.cpp
-	src/SDRThreadQueue.cpp
-	src/SDRThreadTask.cpp
-	src/DemodulatorThread.cpp
-	src/DemodulatorThreadQueue.cpp
-	src/DemodulatorThreadTask.cpp
-	src/AudioThread.cpp
-	src/AudioThreadQueue.cpp
-	src/AudioThreadTask.cpp
-	src/Gradient.cpp
-	src/Timer.cpp
+	src/sdr/SDRThread.cpp
+	src/sdr/SDRThreadQueue.cpp
+	src/sdr/SDRThreadTask.cpp
+	src/demod/DemodulatorThread.cpp
+	src/demod/DemodulatorThreadQueue.cpp
+	src/demod/DemodulatorThreadTask.cpp
+	src/audio/AudioThread.cpp
+	src/audio/AudioThreadQueue.cpp
+	src/audio/AudioThreadTask.cpp
+	src/util/Gradient.cpp
+	src/util/Timer.cpp
+	src/visual/PrimaryGLContext.cpp
 	src/visual/ScopeCanvas.cpp
 	src/visual/ScopeContext.cpp
 	src/visual/SpectrumCanvas.cpp
@ -106,21 +106,21 @@ SET (cubicsdr_sources
 )

 SET (cubicsdr_headers
-    src/CubicSDR.h
-	src/SDRThread.h
-	src/PrimaryGLContext.h
-	src/AppFrame.h
 	src/CubicSDRDefs.h
-	src/SDRThreadQueue.h
-	src/SDRThreadTask.h
-	src/DemodulatorThread.h
-	src/DemodulatorThreadQueue.h
-	src/DemodulatorThreadTask.h
-	src/AudioThread.h
-	src/AudioThreadQueue.h
-	src/AudioThreadTask.h
-	src/Gradient.h
-	src/Timer.h
+    src/CubicSDR.h
+	src/AppFrame.h
+	src/sdr/SDRThread.h
+	src/sdr/SDRThreadQueue.h
+	src/sdr/SDRThreadTask.h
+	src/demod/DemodulatorThread.h
+	src/demod/DemodulatorThreadQueue.h
+	src/demod/DemodulatorThreadTask.h
+	src/audio/AudioThread.h
+	src/audio/AudioThreadQueue.h
+	src/audio/AudioThreadTask.h
+	src/util/Gradient.h
+	src/util/Timer.h
+	src/visual/PrimaryGLContext.h
 	src/visual/ScopeCanvas.h
 	src/visual/ScopeContext.h
 	src/visual/SpectrumCanvas.h
@ -129,7 +129,11 @@ SET (cubicsdr_headers
 	src/visual/WaterfallContext.h
 )

-include_directories ( ${PROJECT_SOURCE_DIR}/src/visual 
+include_directories ( ${PROJECT_SOURCE_DIR}/src/sdr 
+					  ${PROJECT_SOURCE_DIR}/src/demod
+					  ${PROJECT_SOURCE_DIR}/src/audio
+					  ${PROJECT_SOURCE_DIR}/src/util
+					  ${PROJECT_SOURCE_DIR}/src/visual 
 					  ${PROJECT_SOURCE_DIR}/src )

 #configure_files(${PROJECT_SOURCE_DIR}/shaders ${PROJECT_BINARY_DIR}/shaders COPYONLY)
--- a/src/audio/AudioThread.cpp
+++ b/src/audio/AudioThread.cpp
--- a/src/audio/AudioThread.h
+++ b/src/audio/AudioThread.h
--- a/src/audio/AudioThreadQueue.cpp
+++ b/src/audio/AudioThreadQueue.cpp
--- a/src/audio/AudioThreadQueue.h
+++ b/src/audio/AudioThreadQueue.h
--- a/src/audio/AudioThreadTask.cpp
+++ b/src/audio/AudioThreadTask.cpp
--- a/src/audio/AudioThreadTask.h
+++ b/src/audio/AudioThreadTask.h
--- a/src/demod/DemodulatorThread.cpp
+++ b/src/demod/DemodulatorThread.cpp
--- a/src/demod/DemodulatorThread.h
+++ b/src/demod/DemodulatorThread.h
--- a/src/demod/DemodulatorThreadQueue.cpp
+++ b/src/demod/DemodulatorThreadQueue.cpp
--- a/src/demod/DemodulatorThreadQueue.h
+++ b/src/demod/DemodulatorThreadQueue.h
--- a/src/demod/DemodulatorThreadTask.cpp
+++ b/src/demod/DemodulatorThreadTask.cpp
--- a/src/demod/DemodulatorThreadTask.h
+++ b/src/demod/DemodulatorThreadTask.h
--- a/src/sdr/SDRThread.cpp
+++ b/src/sdr/SDRThread.cpp
--- a/src/sdr/SDRThread.h
+++ b/src/sdr/SDRThread.h
--- a/src/sdr/SDRThreadQueue.cpp
+++ b/src/sdr/SDRThreadQueue.cpp
--- a/src/sdr/SDRThreadQueue.h
+++ b/src/sdr/SDRThreadQueue.h
--- a/src/sdr/SDRThreadTask.cpp
+++ b/src/sdr/SDRThreadTask.cpp
--- a/src/sdr/SDRThreadTask.h
+++ b/src/sdr/SDRThreadTask.h
--- a/src/util/Gradient.cpp
+++ b/src/util/Gradient.cpp
--- a/src/util/Gradient.h
+++ b/src/util/Gradient.h
--- a/src/util/Timer.cpp
+++ b/src/util/Timer.cpp
--- a/src/util/Timer.h
+++ b/src/util/Timer.h
--- a/src/visual/PrimaryGLContext.cpp
+++ b/src/visual/PrimaryGLContext.cpp
--- a/src/visual/PrimaryGLContext.h
+++ b/src/visual/PrimaryGLContext.h