From b7a9d27f53b45e85c7675d7f718c855cadf67d76 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 29 Jul 2013 05:06:40 +0000 Subject: [PATCH] Comm ports listing on Win32 git-svn-id: https://svn.code.sf.net/p/freetel/code@1325 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/src/Makefile.win32 | 4 ++-- fdmdv2/src/dlg_ptt.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32 index 9c761ce7..58e00d9d 100644 --- 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 2eb3dbac..97f888cd 100644 --- 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 */ -- 2.25.1