From 18d2b1909afc8e8ca62ffc80b810f01c992dea33 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Fri, 27 Jan 2023 11:03:38 +0000 Subject: [PATCH] Slight change --- wfmain.cpp | 3 +++ wfview.sln | 1 + wfview.vcxproj | 13 ++++++++++++- wfview.vcxproj.filters | 30 ++++++++++++++++++++++++++++++ wfview.vcxproj.user | 8 ++++---- wfview_resource.aps | Bin 157368 -> 157464 bytes 6 files changed, 50 insertions(+), 5 deletions(-) diff --git a/wfmain.cpp b/wfmain.cpp index 4570338..01ea280 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -2045,6 +2045,9 @@ void wfmain::loadSettings() udpPrefs.clientName = settings->value("ClientName", udpDefPrefs.clientName).toString(); + udpPrefs.halfDuplex = settings->value("HalfDuplex", udpDefPrefs.halfDuplex).toBool(); + ui->audioDuplexCombo->setCurrentIndex((int)udpPrefs.halfDuplex); + settings->endGroup(); settings->beginGroup("Server"); diff --git a/wfview.sln b/wfview.sln index dc35573..4a76956 100644 --- a/wfview.sln +++ b/wfview.sln @@ -27,6 +27,7 @@ Global {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|Win32.ActiveCfg = Release|Win32 {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|Win32.Build.0 = Release|Win32 {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|x64.ActiveCfg = Release|x64 + {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/wfview.vcxproj b/wfview.vcxproj index 658b730..aa3db27 100644 --- a/wfview.vcxproj +++ b/wfview.vcxproj @@ -103,6 +103,7 @@ wfview true false + ../hidapi/hidapi;$(IncludePath) wfview @@ -141,7 +142,7 @@ stdcpp17 release\ MaxSpeed - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.55";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="4574e2b";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.56";BUILD_WFVIEW;USB_CONTROLLER;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="4574e2b";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) false @@ -406,6 +407,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug + @@ -415,6 +417,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug + @@ -431,6 +434,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug + @@ -443,6 +447,12 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug + + + + + + @@ -538,6 +548,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug + diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters index 04a65b6..f35b4ad 100644 --- a/wfview.vcxproj.filters +++ b/wfview.vcxproj.filters @@ -149,6 +149,15 @@ Source Files + + Source Files + + + Source Files + + + Source Files + @@ -262,6 +271,21 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -299,6 +323,9 @@ Form Files + + Form Files + @@ -441,5 +468,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user index e6fe3c4..12a975a 100644 --- a/wfview.vcxproj.user +++ b/wfview.vcxproj.user @@ -45,10 +45,10 @@ 2022-08-21T18:58:23.4329764Z - 2023-01-12T19:02:11.7122024Z + 2023-01-26T18:44:24.1600022Z - 2023-01-12T19:02:11.0783744Z + 2023-01-26T18:44:23.8016613Z 2022-08-22T10:47:49.1255783Z @@ -60,9 +60,9 @@ 2022-08-20T19:06:43.4553894Z - 2023-01-12T19:02:13.6556090Z + 2023-01-26T18:44:25.2499950Z - 2023-01-12T19:02:12.4064183Z + 2023-01-26T18:44:24.5602633Z \ No newline at end of file diff --git a/wfview_resource.aps b/wfview_resource.aps index 3e7faabf1b7a39ac7283357c587acab60d93588a..0a6203624685146d0919434ee120b21dd0ef3d62 100644 GIT binary patch delta 216 zcmdmSmUG5A&IvBeUs9Q-2c|NaO{^7X6lk2fbt>a~b;g?Mts0E-Kx(N5qo*(n0}}%( zxHFwmlTn#*$97ds#&E`11)wY=gC|2CLkUAFLlKZpWXNIg1CqHwJ_CaUSl*c-AIJxZ zfYcQO#WcX;K0uLlu#OO*-b98JAU_vK7cpdmRJB)XF>bHaVk)<06qx=omB||DEZsCF bWhNKx=|O2sN{lzAmjbzr9n)u~G06h}y9qDq delta 122 zcmbPnj&sLZ&IvBeQ&O3xZ%kz}n^-H(XwW!y>r}?~>WnheTQwNvfz(nBMo(b|1||kn zP&1uTlTn#5V!Ns)V>n~`9WBP~ceI#FtQifa2c|Ju12y)hF)1@W(VD&~jY)~IV)|7e Mmr-N-&om}^02gv05&!@I