From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sat, 22 Dec 2012 07:29:28 +0000 (+0000)
Subject: changed changed fifo.h and fdmdv.h to more unique names codec2_fifo.h & codec2_fdmdv.h
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=1a31d10ead49ff9c52874392c3ef105f71d27723;p=freetel-svn-tracking.git

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 a550b3ae..7a78b59a 100644
--- 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 cacac6b0..42ce86e1 100644
--- 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 3ddbe957..526932f4 100644
--- 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 0f2a371e..3d216c0d 100644
--- 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"