Move band-handler to library and remove duplications

satdreamgr · Mar 10, 2019 · b887b85 · b887b85
1 parent 720b3ed
commit b887b85
Show file tree

Hide file tree

Showing 43 changed files with 315 additions and 1,768 deletions.
diff --git a/dab-scanner/CMakeLists.txt b/dab-scanner/CMakeLists.txt
@@ -223,7 +223,6 @@ endif ()
 	set (${objectName}_HDRS
 	     ${${objectName}_HDRS}
 	     ./ringbuffer.h
-	     ./band-handler.h
 	     ./dab_tables.h
 	     ./service-printer.h
 	     ../dab-api.h
@@ -255,7 +254,8 @@ endif ()
 	     ../library/includes/backend/data/data-processor.h
 	     ../library/includes/backend/data/mot/mot-handler.h 
 	     ../library/includes/backend/data/mot/mot-dir.h 
-	     ../library/includes/backend/data/mot/mot-object.h 
+	     ../library/includes/backend/data/mot/mot-object.h
+         ../library/includes/support/band-handler.h 
 	     ../library/includes/support/viterbi_handler.h
 	     ../library/includes/support/protTables.h
 	     ../library/includes/support/protection.h
@@ -269,7 +269,6 @@ endif ()
 	set (${objectName}_SRCS
 	     ${${objectName}_SRCS}
 	     ./main.cpp
-	     ./band-handler.cpp
 	     ./dab_tables.cpp
 	     ./service-printer.cpp
 	     ../devices/device-handler.cpp
@@ -300,7 +299,8 @@ endif ()
 	     ../library/src/backend/data/data-processor.cpp
 	     ../library/src/backend/data/mot/mot-handler.cpp 
 	     ../library/src/backend/data/mot/mot-dir.cpp 
-	     ../library/src/backend/data/mot/mot-object.cpp 
+	     ../library/src/backend/data/mot/mot-object.cpp
+         ../library/src/support/band-handler.cpp
 	     ../library/src/support/viterbi-handler.cpp
 	     ../library/src/support/protTables.cpp
 	     ../library/src/support/protection.cpp

diff --git a/dab-scanner/band-handler.cpp b/dab-scanner/band-handler.cpp
diff --git a/dab-scanner/main.cpp b/dab-scanner/main.cpp
@@ -30,7 +30,7 @@
 #include	<complex>
 #include	<vector>
 #include	"dab-api.h"
-#include	"band-handler.h"
+#include	"includes/support/band-handler.h"
 #include	"service-printer.h"
 #ifdef	HAVE_SDRPLAY
 #include	"sdrplay-handler.h"

diff --git a/example-1/CMakeLists.txt b/example-1/CMakeLists.txt
@@ -160,12 +160,12 @@ endif ()
 	set (${objectName}_HDRS
 	     ${${objectName}_HDRS}
 	     ../dab-api.h
-	     ../includes/dab-constants.h
+	     ../library/includes/dab-constants.h
+         ../library/includes/support/band-handler.h
 	     ./ringbuffer.h
 	     ./audio-base.h
 	     ./audiosink.h
 	     ./newconverter.h
-	     ./band-handler.h
 	     ../devices/device-handler.h
 	)
 
@@ -175,8 +175,8 @@ endif ()
 	     ./audio-base.cpp
 	     ./audiosink.cpp
 	     ./newconverter.cpp
-	     ./band-handler.cpp
 	     ../devices/device-handler.cpp
+         ../library/src/support/band-handler.cpp
 	)
 
 	add_executable (${objectName}

diff --git a/example-1/band-handler.cpp b/example-1/band-handler.cpp
diff --git a/example-1/band-handler.h b/example-1/band-handler.h
diff --git a/example-1/main.cpp b/example-1/main.cpp
@@ -31,7 +31,7 @@
 #include	<vector>
 #include	"audiosink.h"
 #include	"dab-api.h"
-#include	"band-handler.h"
+#include	"includes/support/band-handler.h"
 #ifdef	HAVE_SDRPLAY
 #include	"sdrplay-handler.h"
 #elif	HAVE_AIRSPY