Fixed after merge

2022-12-29 16:06:42 +00:00 · 2022-12-29 16:06:42 +00:00 · 891fd68a52
commit 891fd68a52
--- a/audiodevices.cpp
+++ b/audiodevices.cpp
@ -37,13 +37,14 @@ void audioDevices::enumerate()
        {
            Pa_Terminate();

+
 #if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
            foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
 #else
            const auto audioInputs = mediaDevices.audioInputs();
            for (const QAudioDevice& deviceInfo : audioInputs)
 #endif
-                {
+            {
                bool isDefault = false;
                if (numInputDevices == 0) {

@ -81,7 +82,7 @@ void audioDevices::enumerate()
 #endif

 #if (defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(6,0,0)))
-                }
+                    }
 #endif
                numInputDevices++;
            }
@ -136,7 +137,7 @@ void audioDevices::enumerate()
 #endif

 #if (defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(6,0,0)))
-                }
+                    }
 #endif
                numOutputDevices++;
            }
--- a/audiodevices.h
+++ b/audiodevices.h
@ -7,6 +7,7 @@
 #else
 #include <QMediaDevices>
 #include <QAudioDevice>
+#include <QString>
 #endif

 #include <QFontMetrics>
@ -20,22 +21,25 @@

 #include "wfviewtypes.h"

+
 struct audioDevice {
    audioDevice(QString name, int deviceInt, bool isDefault) : name(name), deviceInt(deviceInt), isDefault(isDefault) {};

 #if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
    audioDevice(QString name, const QAudioDeviceInfo deviceInfo, QString realm, bool isDefault) : name(name), deviceInfo(deviceInfo), realm(realm), isDefault(isDefault) {};
 #else
-    audioDevice(QString name, const QAudioDevice deviceInfo, QString realm, bool isDefault) : name(name), deviceInfo(deviceInfo), realm(realm), isDefault(isDefault) {};
+    audioDevice(QString name, QAudioDevice deviceInfo, QString realm, bool isDefault) : name(name), deviceInfo(deviceInfo), realm(realm), isDefault(isDefault) {};
 #endif

    QString name;
    int deviceInt;
+
 #if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
    const QAudioDeviceInfo deviceInfo;
 #else
-    const QAudioDevice deviceInfo;
+    QAudioDevice deviceInfo;
 #endif
+
    QString realm;
    bool isDefault;
 };
@ -84,6 +88,8 @@ signals:
    void updated();
 protected:
 private:
+
+
    audioType system;
    QFontMetrics fm;
    QString defaultInputDeviceName;
@ -94,6 +100,9 @@ private:
    QList<audioDevice> outputs;
    int numCharsIn = 0;
    int numCharsOut = 0;
+
+
+
 };

 #endif
--- a/wfmain.ui
+++ b/wfmain.ui
@ -1798,6 +1798,7 @@
             <font>
              <family>DejaVu Sans Mono</family>
              <pointsize>14</pointsize>
+              <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
@ -2684,23 +2685,6 @@
                       </property>
                      </widget>
                     </item>
-                     <item>
-                      <spacer name="horizontalSpacer_13">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>40</width>
-                         <height>20</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
-                    </layout>
-                   </item>
-                   <item>
-                    <layout class="QHBoxLayout" name="horizontalLayout_46">
                     <item>
                      <widget class="QLabel" name="label_19">
                       <property name="text">
@ -2729,6 +2713,23 @@
                       </property>
                      </widget>
                     </item>
+                     <item>
+                      <spacer name="horizontalSpacer_13">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                    </layout>
+                   </item>
+                   <item>
+                    <layout class="QHBoxLayout" name="horizontalLayout_17">
                     <item>
                      <widget class="QLabel" name="label_17">
                       <property name="text">
@ -2764,48 +2765,25 @@
                      </widget>
                     </item>
                     <item>
-                      <widget class="QLabel" name="label_40">
+                      <widget class="QLabel" name="label_15">
                       <property name="text">
-                        <string>Audio System</string>
+                        <string>Audio Output </string>
                       </property>
                      </widget>
                     </item>
                     <item>
-                      <widget class="QComboBox" name="audioSystemCombo">
-                       <item>
-                        <property name="text">
-                         <string>QT Audio</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>PortAudio</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>RT Audio</string>
-                        </property>
-                       </item>
-                      </widget>
-                     </item>
-                     <item>
-                      <spacer name="horizontalSpacer_30">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
+                      <widget class="QComboBox" name="audioOutputCombo">
+                       <property name="maximumSize">
                        <size>
                         <width>120</width>
                         <height>16777215</height>
                        </size>
                       </property>
-                      </spacer>
+                       <property name="accessibleName">
+                        <string>Audio Output Selector</string>
+                       </property>
+                      </widget>
                     </item>
-                    </layout>
-                   </item>
-                   <item>
-                    <layout class="QHBoxLayout" name="horizontalLayout_17">
                     <item>
                      <widget class="QLabel" name="label_18">
                       <property name="text">
@ -2842,14 +2820,10 @@
                       </property>
                      </spacer>
                     </item>
-                    </layout>
-                   </item>
-                   <item>
-                    <layout class="QHBoxLayout" name="horizontalLayout_45">
                     <item>
-                      <widget class="QLabel" name="label_15">
+                      <widget class="QLabel" name="label_40">
                       <property name="text">
-                        <string>Audio Output </string>
+                        <string>Audio System</string>
                       </property>
                      </widget>
                     </item>
@ -5335,6 +5309,7 @@
       <widget class="QPushButton" name="exitBtn">
        <property name="font">
         <font>
+          <weight>50</weight>
          <bold>false</bold>
         </font>
        </property>
--- a/wfview.vcxproj
+++ b/wfview.vcxproj
@ -142,8 +142,8 @@
      <QtUicFileName>ui_%(Filename).h</QtUicFileName>
    </QtUic>
    <PostBuildEvent>
-      <Command>cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll release\
-cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll release\</Command>
+      <Command>cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll wfview-release\
+cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release\</Command>
    </PostBuildEvent>
    <PostBuildEvent>
      <Message>Copy DLL Files</Message>
@ -191,8 +191,8 @@ cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll release\</Command
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
    </ResourceCompile>
    <PostBuildEvent>
-      <Command>cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll debug
-cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll debug</Command>
+      <Command>cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll wfview-debug
+cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug</Command>
      <Message>Copy DLL files</Message>
    </PostBuildEvent>
    <QtMoc>
@ -222,9 +222,11 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll debug</Command>
    <ClCompile Include="audiodevices.cpp" />
    <ClCompile Include="audiohandler.cpp" />
    <ClCompile Include="calibrationwindow.cpp" />
+    <ClCompile Include="cluster.cpp" />
    <ClCompile Include="commhandler.cpp" />
    <ClCompile Include="freqmemory.cpp" />
    <ClCompile Include="logcategories.cpp" />
+    <ClCompile Include="loggingwindow.cpp" />
    <ClCompile Include="main.cpp" />
    <ClCompile Include="meter.cpp" />
    <ClCompile Include="pahandler.cpp" />
@ -252,6 +254,8 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll debug</Command>
    <QtMoc Include="aboutbox.h">
    </QtMoc>
    <QtMoc Include="audiodevices.h" />
+    <QtMoc Include="loggingwindow.h" />
+    <QtMoc Include="cluster.h" />
    <ClInclude Include="resampler\arch.h" />
    <QtMoc Include="audioconverter.h">
    </QtMoc>
@ -329,6 +333,7 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll debug</Command>
    </QtUic>
    <QtUic Include="calibrationwindow.ui">
    </QtUic>
+    <QtUic Include="loggingwindow.ui" />
    <QtUic Include="repeatersetup.ui">
    </QtUic>
    <QtUic Include="satellitesetup.ui">
--- a/wfview.vcxproj.filters
+++ b/wfview.vcxproj.filters
@ -137,6 +137,12 @@
    <ClCompile Include="audiodevices.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="loggingwindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cluster.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\rtaudio\RTAUdio.h">
@ -272,6 +278,9 @@
    <QtUic Include="wfmain.ui">
      <Filter>Form Files</Filter>
    </QtUic>
+    <QtUic Include="loggingwindow.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
  </ItemGroup>
  <ItemGroup>
    <None Include="qdarkstyle\rc\Hmovetoolbar.png">
@ -411,5 +420,11 @@
    <QtMoc Include="audiodevices.h">
      <Filter>Header Files</Filter>
    </QtMoc>
+    <QtMoc Include="loggingwindow.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="cluster.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
  </ItemGroup>
 </Project>
--- a/wfview.vcxproj.user
+++ b/wfview.vcxproj.user
@ -18,7 +18,8 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerDebuggerType>NativeOnly</LocalDebuggerDebuggerType>
-    <LocalDebuggerAmpDefaultAccelerator> </LocalDebuggerAmpDefaultAccelerator>
+    <LocalDebuggerAmpDefaultAccelerator>
+    </LocalDebuggerAmpDefaultAccelerator>
  </PropertyGroup>
  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <QtLastBackgroundBuild>2022-08-22T10:47:36.6935363Z</QtLastBackgroundBuild>
@ -27,7 +28,7 @@
    <QtLastBackgroundBuild>2022-08-21T18:58:23.4329764Z</QtLastBackgroundBuild>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="QtSettings">
-    <QtLastBackgroundBuild>2022-08-22T19:43:39.8544189Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-29T15:52:43.8635901Z</QtLastBackgroundBuild>
  </PropertyGroup>
  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <QtLastBackgroundBuild>2022-08-22T10:47:49.1255783Z</QtLastBackgroundBuild>
@ -36,6 +37,6 @@
    <QtLastBackgroundBuild>2022-08-20T19:06:43.4553894Z</QtLastBackgroundBuild>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="QtSettings">
-    <QtLastBackgroundBuild>2022-08-22T19:43:40.1498727Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-12-29T15:52:44.2967804Z</QtLastBackgroundBuild>
  </PropertyGroup>
 </Project>