Comm ports listing on Win32

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

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 9c761ce7e58c4084e3110fa95b3bee67859e4b8e..58e00d9d10b35f08a5fee585d3cd0a4fe1a13c6c 100644 (file)
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -16,7 +16,7 @@ CODEC2_INC=$(CODEC2_PATH)/src
 CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
 
 CPP_FLAGS = -D_NO_AUTOTOOLS_ -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -I. -g -Wall -DSVN_REVISION=\"$(SVN_REVISION)\"
-LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lhamlib -lsox
+LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lhamlib -lsox -lctb-0.16
 
 OBJS = topFrame.o \
 fdmdv2_main.o \
@@ -35,7 +35,7 @@ sox_biquad.o \
 hamlib.o \
 ../../codec2-dev/src/golay23.o
 
-HDRS = version.h dlg_audiooptions.h dlg_ptt.h dlg_filter.h fdmdv2_main.h fdmdv2_defines.h fdmdv2_plot.h fdmdv2_plot_scalar.h fdmdv2_plot_waterfall_linux.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h topFrame.h dlg_audiooptions.h topFrame.h varicode.h ../../codec2-dev/src/golay23.h hamlib.h
+HDRS = version.h dlg_audiooptions.h dlg_ptt.h dlg_filter.h fdmdv2_main.h fdmdv2_defines.h fdmdv2_plot.h fdmdv2_plot_scalar.h fdmdv2_plot_waterfall.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h topFrame.h dlg_audiooptions.h topFrame.h varicode.h ../../codec2-dev/src/golay23.h hamlib.h
 
 all: freedv
 

diff --git a/fdmdv2/src/dlg_ptt.cpp b/fdmdv2/src/dlg_ptt.cpp
index 2eb3dbac162d427385aa12b8ad36f8aea58b9896..97f888cd98afa8835dd28c75c9ded86c9ea5eb14 100644 (file)
--- a/fdmdv2/src/dlg_ptt.cpp
+++ b/fdmdv2/src/dlg_ptt.cpp
@@ -242,12 +242,12 @@ void ComPortsDlg::populatePortList()
         for(unsigned int i = 0; i < values; i++)
         {
             key.QueryValue(key_name, key_data);
-//            wxPrintf("Value:  %s Data: %s\n", key_name, key_data);
+            //wxPrintf("Value:  %s Data: %s\n", key_name, key_data);
             aStr.Add(key_data, 1);
             key.GetNextValue(key_name, el);
         }
     }
-    m_cbSerialPort->Append(aStr);
+    m_listCtrlPorts->Append(aStr);
 #endif
 #ifdef __WXGTK__
     /* TODO(Joel): http://stackoverflow.com/questions/2530096/how-to-find-all-serial-devices-ttys-ttyusb-on-linux-without-opening-them */