changed changed fifo.h and fdmdv.h to more unique names codec2_fifo.h & codec2_fdmdv.h

git-svn-id: https://svn.code.sf.net/p/freetel/code@1151 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/src/dlg_audiooptions.h b/fdmdv2/src/dlg_audiooptions.h
index a550b3aea0da2d918f3cef87ea0dc4187bde428d..7a78b59a1f6a97f1b0490e7864996d094840f92d 100644 (file)
--- a/fdmdv2/src/dlg_audiooptions.h
+++ b/fdmdv2/src/dlg_audiooptions.h
@@ -33,7 +33,7 @@
 #include "pa_asio.h"
 #endif
 #endif
-#include "fifo.h"
+#include "codec2_fifo.h"
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
 // AudioInfoDisplay

diff --git a/fdmdv2/src/fdmdv2_defines.h b/fdmdv2/src/fdmdv2_defines.h
index cacac6b07409eb49b3064e92d15892da32cbe1d3..42ce86e194684a28bbfc502bbae3982ef8e4ef29 100644 (file)
--- a/fdmdv2/src/fdmdv2_defines.h
+++ b/fdmdv2/src/fdmdv2_defines.h
@@ -22,7 +22,7 @@
 #define __FDMDV2_DEFINES__
 
 #include "wx/wx.h"
-#include "fdmdv.h"
+#include "codec2_fdmdv.h"
 
 // Spectrogram and Waterfall
 

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index 3ddbe95784c633654925250411d88d935f92730d..526932f447a18a59e9b2161e5ffb315a3c91d946 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -49,8 +49,8 @@
 #include <samplerate.h>
 
 #include "codec2.h"
-#include "fdmdv.h"
-#include "fifo.h"
+#include "codec2_fdmdv.h"
+#include "codec2_fifo.h"
 
 #include "ctb-0.16/ctb.h"
 #include "ctb-0.16/portscan.h"

diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.h b/fdmdv2/src/fdmdv2_pa_wrapper.h
index 0f2a371ebcefa5d82c3bde502f427239fa0efe5c..3d216c0dba9904e011aa1eec87227773fbc6c1a5 100644 (file)
--- a/fdmdv2/src/fdmdv2_pa_wrapper.h
+++ b/fdmdv2/src/fdmdv2_pa_wrapper.h
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <math.h>
 #include "fdmdv2_defines.h"
-#include "fdmdv.h"
+#include "codec2_fdmdv.h"
 #include "codec2.h"
 #include "portaudio.h"