diff --git a/rthandler.cpp b/rthandler.cpp index f6ddacf..a60a748 100644 --- a/rthandler.cpp +++ b/rthandler.cpp @@ -302,7 +302,7 @@ int rtHandler::readData(void* outputBuffer, void* inputBuffer, Q_UNUSED(inputBuffer); Q_UNUSED(streamTime); #if (QT_VERSION < QT_VERSION_CHECK(6,0,0)) - int nBytes = nFrames * outFormat.channelCount() * (outFormat.sampleSize() / 8)); + int nBytes = nFrames * outFormat.channelCount() * (outFormat.sampleSize() / 8); #else int nBytes = nFrames * outFormat.channelCount() * sizeof(outFormat.sampleFormat()); #endif diff --git a/wfmain.cpp b/wfmain.cpp index 39cdf7e..b50dfab 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -73,6 +73,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode qRegisterMetaType>(); qRegisterMetaType(); qRegisterMetaType(); + qRegisterMetaType(); haveRigCaps = false; diff --git a/wfmain.h b/wfmain.h index 0b6839a..d4854b7 100644 --- a/wfmain.h +++ b/wfmain.h @@ -1074,6 +1074,7 @@ Q_DECLARE_METATYPE(enum mode_kind) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(rigstate*) +Q_DECLARE_METATYPE(codecType) //void (*wfmain::logthistext)(QString text) = NULL; diff --git a/wfview.sln b/wfview.sln index f02ac06..5a408a1 100644 --- a/wfview.sln +++ b/wfview.sln @@ -9,16 +9,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wfserver", "wfserver.vcxpro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|Win32.ActiveCfg = Debug|Win32 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x64.ActiveCfg = Debug|x64 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x64.Build.0 = Debug|x64 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|Win32.ActiveCfg = Release|Win32 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|Win32.Build.0 = Release|Win32 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x64.ActiveCfg = Release|x64 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x64.Build.0 = Release|x64 + {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Debug|Win32.ActiveCfg = Debug|Win32 + {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Debug|Win32.Build.0 = Debug|Win32 {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Debug|x64.ActiveCfg = Debug|x64 {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Debug|x64.Build.0 = Debug|x64 + {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|Win32.ActiveCfg = Release|Win32 {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/wfview.vcxproj b/wfview.vcxproj index 5007670..2bf17a5 100644 --- a/wfview.vcxproj +++ b/wfview.vcxproj @@ -1,6 +1,14 @@  + + Debug + Win32 + + + Release + Win32 + Release x64 @@ -28,6 +36,15 @@ release\ wfview + + v142 + wfview-release\ + false + NotSet + Application + release\ + wfview + v142 wfview-debug\ @@ -37,6 +54,15 @@ debug\ wfview + + v142 + wfview-debug\ + false + NotSet + Application + debug\ + wfview + @@ -45,9 +71,15 @@ + + + + + + @@ -59,6 +91,11 @@ true true + + wfview + true + true + wfview-release\ release\ @@ -66,12 +103,26 @@ true false + + wfview + true + false + $(SolutionDir)wfview-release + - msvc2019_64_v62 + msvc2019 + core;gui;network;widgets;multimedia;printsupport;serialport;xml + + + msvc2019 core;gui;network;widgets;multimedia;printsupport;serialport;xml - msvc2019_64_v62 + msvc2019 + core;gui;network;widgets;multimedia;printsupport;serialport;xml + + + msvc2019 core;gui;network;widgets;multimedia;printsupport;serialport;xml @@ -149,6 +200,78 @@ cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release\Copy DLL Files + + + .;..\rtaudio;..\portaudio\include;..\qcustomplot;..\opus\include;..\eigen;..\r8brain-free-src;resampler;release;/include;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + release\ + false + None + 4577;4467;%(DisableSpecificWarnings) + Sync + stdcpp17 + release\ + MaxSpeed + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.4";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) + false + + + MultiThreadedDLL + true + true + Level3 + true + + + ..\portaudio\msvc\Win32\Release\portaudio_x86.lib;..\qcustomplot\Win32\qcustomplot2.lib;..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies) + ..\opus\win32\VS2015\Win32\Release;..\qcustomplot\Win32;..\portaudio\msvc\Win32\Release;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + true + false + true + false + true + $(OutDir)\wfview.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION=\"1.4\";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;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + + + msvc + ./$(Configuration)/moc_predefs.h + Moc'ing %(Identity)... + output + $(Configuration) + moc_%(Filename).cpp + + + default + Rcc'ing %(Identity)... + $(Configuration) + qrc_%(Filename).cpp + + + Uic'ing %(Identity)... + $(ProjectDir) + ui_%(Filename).h + + + cmd /c copy /y ..\qcustomplot\Win32\qcustomplot2.dll wfview-release\ +cmd /c copy /y ..\portaudio\msvc\Win32\Release\portaudio_x86.dll wfview-release\ + + + Copy DLL Files + + .;..\rtaudio;..\portaudio\include;..\qcustomplot;..\opus\include;..\eigen;..\r8brain-free-src;resampler;debug;/include;%(AdditionalIncludeDirectories) @@ -192,6 +315,72 @@ cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release\ cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll wfview-debug +cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug + Copy DLL files + + + msvc + ./$(Configuration)/moc_predefs.h + Moc'ing %(Identity)... + output + $(Configuration) + moc_%(Filename).cpp + + + default + Rcc'ing %(Identity)... + $(Configuration) + qrc_%(Filename).cpp + + + Uic'ing %(Identity)... + $(ProjectDir) + ui_%(Filename).h + + + + + .;..\rtaudio;..\portaudio\include;..\qcustomplot;..\opus\include;..\eigen;..\r8brain-free-src;resampler;debug;/include;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + debug\ + false + ProgramDatabase + 4577;4467;%(DisableSpecificWarnings) + Sync + stdcpp17 + debug\ + Disabled + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.4";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";%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL + true + true + Level3 + true + stdc17 + + + ..\portaudio\msvc\X64\Debug\portaudio_x64.lib;..\qcustomplot\x64\qcustomplotd2.lib;..\opus\win32\VS2015\x64\Debug\opus.lib;$(QTDIR)\lib\Qt6Multimediad.lib;$(QTDIR)\lib\Qt6PrintSupportd.lib;$(QTDIR)\lib\Qt6Widgetsd.lib;$(QTDIR)\lib\Qt6Guid.lib;$(QTDIR)\lib\Qt6SerialPortd.lib;$(QTDIR)\lib\Qt6Networkd.lib;$(QTDIR)\lib\Qt6Cored.lib;$(QTDIR)\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies) + ..\opus\win32\VS2015\x64\Debug;..\qcustomplot\x64;..\portaudio\msvc\X64\Debug;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + true + true + $(OutDir)\wfview.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION=\"1.4\";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\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + + + cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll wfview-debug cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug Copy DLL files @@ -314,18 +503,28 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug Document true + true $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -faligned-new -Zi -MDd -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -faligned-new -Zi -MDd -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h Generate moc_predefs.h + Generate moc_predefs.h debug\moc_predefs.h;%(Outputs) + debug\moc_predefs.h;%(Outputs) Document $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -fvisibility=hidden -fvisibility-inlines-hidden -faligned-new -O2 -MD -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -fvisibility=hidden -fvisibility-inlines-hidden -faligned-new -O2 -MD -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h Generate moc_predefs.h + Generate moc_predefs.h release\moc_predefs.h;%(Outputs) + release\moc_predefs.h;%(Outputs) true + true @@ -377,14 +576,18 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug resources + resources resources + resources style + style style + style diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters index 5e0407c..2e83e69 100644 --- a/wfview.vcxproj.filters +++ b/wfview.vcxproj.filters @@ -56,12 +56,18 @@ Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files @@ -71,6 +77,9 @@ Source Files + + Source Files + Source Files @@ -134,15 +143,6 @@ Source Files - - Source Files - - - Source Files - - - Source Files - @@ -157,6 +157,9 @@ Header Files + + Header Files + Header Files @@ -166,6 +169,9 @@ Header Files + + Header Files + Header Files @@ -175,6 +181,9 @@ Header Files + + Header Files + Header Files @@ -263,6 +272,9 @@ Form Files + + Form Files + Form Files @@ -278,9 +290,6 @@ Form Files - - Form Files - @@ -416,15 +425,4 @@ - - - Header Files - - - Header Files - - - Header Files - - \ No newline at end of file diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user index d10202f..b7f9ea6 100644 --- a/wfview.vcxproj.user +++ b/wfview.vcxproj.user @@ -6,29 +6,49 @@ PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + + PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + + PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + + PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + WindowsLocalDebugger NativeOnly + + WindowsLocalDebugger + NativeOnly + + 2022-08-22T10:47:36.6935363Z 2022-08-21T18:58:23.4329764Z + + 2022-08-21T18:58:23.4329764Z + - 2022-12-29T15:52:43.8635901Z + 2023-01-01T15:50:44.9253626Z + + + 2023-01-01T15:50:44.4836825Z 2022-08-22T10:47:49.1255783Z @@ -36,7 +56,13 @@ 2022-08-20T19:06:43.4553894Z + + 2022-08-20T19:06:43.4553894Z + - 2022-12-29T15:52:44.2967804Z + 2023-01-01T15:50:45.8112195Z + + + 2023-01-01T15:50:45.3745293Z \ No newline at end of file diff --git a/wfview_resource.rc b/wfview_resource.rc index 75dc080..6ccdf69 100644 --- a/wfview_resource.rc +++ b/wfview_resource.rc @@ -1,6 +1,6 @@ #include -IDI_ICON1 ICON "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico" +IDI_ICON1 ICON DISCARDABLE "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION 0,0,0,0 @@ -11,9 +11,9 @@ VS_VERSION_INFO VERSIONINFO #else FILEFLAGS 0x0L #endif - FILEOS VOS_NT_WINDOWS32 + FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN + FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN @@ -26,9 +26,6 @@ VS_VERSION_INFO VERSIONINFO VALUE "OriginalFilename", "wfview.exe\0" VALUE "ProductName", "wfview\0" VALUE "ProductVersion", "0.0.0.0\0" - VALUE "InternalName", "\0" - VALUE "Comments", "\0" - VALUE "LegalTrademarks", "\0" END END BLOCK "VarFileInfo"