Merge branch 'master' into ms-2020-experiment

.github/workflows/cmake-windows.yml

@@ -23,4 +23,4 @@ jobs:
     - name: Build freedv-gui
       shell: bash
       working-directory: ${{github.workspace}}/docker
-      run: ./freedv_build_windows.sh --branch ${{github.ref}} 64
+      run: ./freedv_build_windows.sh --branch ${{github.ref_name}} 64

USER_MANUAL.html

@@ -610,6 +610,7 @@ FMA             -       Supports FMA extensions using YMM state</code></pre>
 <li>Suppress refresh of the sync indicator if disabled/no change in sync. (PR #230)</li>
 <li>Clarify location from where to run Docker build script. (PR #231)</li>
 <li>Change shutdown ordering to prevent hangs on slower systems. (PR #236)</li>
+<li>Disable PulseAudio suspend failure due to interactions with pipewire. (PR #239)</li>
 </ul></li>
 </ol>
 <h2 id="v1.7.0-february-2022"><span class="header-section-number">16.2</span> V1.7.0 February 2022</h2>

USER_MANUAL.md

@@ -818,6 +818,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * Suppress refresh of the sync indicator if disabled/no change in sync. (PR #230)
     * Clarify location from where to run Docker build script. (PR #231)
     * Change shutdown ordering to prevent hangs on slower systems. (PR #236)
+    * Disable PulseAudio suspend failure due to interactions with pipewire. (PR #239)
 
 ## V1.7.0 February 2022
 

src/audio/PulseAudioDevice.cpp

@@ -100,7 +100,10 @@ void PulseAudioDevice::start()
     if (direction_ == IAudioEngine::AUDIO_ENGINE_OUT)
     {
         time_t result = time(NULL);
-        fprintf(stderr, "PulseAudioDevice[%s]: connecting to playback device %s\n", ctime(&result), (const char*)devName_.ToUTF8());
+        char buf[256];
+        struct tm *p = localtime(&result);
+        strftime(buf, 256, "%c", p);
+        fprintf(stderr, "PulseAudioDevice[%s]: connecting to playback device %s\n", buf, (const char*)devName_.ToUTF8());
         
         pa_stream_set_write_callback(stream_, &PulseAudioDevice::StreamWriteCallback_, this);
         result = pa_stream_connect_playback(
@@ -110,7 +113,10 @@ void PulseAudioDevice::start()
     else
     {
         time_t result = time(NULL);
-        fprintf(stderr, "PulseAudioDevice[%s]: connecting to record device %s\n", ctime(&result), (const char*)devName_.ToUTF8());
+        char buf[256];
+        struct tm *p = localtime(&result);
+        strftime(buf, 256, "%c", p);
+        fprintf(stderr, "PulseAudioDevice[%s]: connecting to record device %s\n", buf, (const char*)devName_.ToUTF8());
         
         pa_stream_set_read_callback(stream_, &PulseAudioDevice::StreamReadCallback_, this);
         result = pa_stream_connect_record(
@@ -319,7 +325,10 @@ void PulseAudioDevice::StreamMovedCallback_(pa_stream *p, void *userdata)
     PulseAudioDevice* thisObj = static_cast<PulseAudioDevice*>(userdata);
 
     time_t result = time(NULL);
-    fprintf(stderr, "PulseAudioDevice[%s]: stream named %s has been moved to %s\n", ctime(&result), (const char*)thisObj->devName_.ToUTF8(), newDevName);
+    char buf[256];
+    struct tm *lt = localtime(&result);
+    strftime(buf, 256, "%c", lt);
+    fprintf(stderr, "PulseAudioDevice[%s]: stream named %s has been moved to %s\n", buf, (const char*)thisObj->devName_.ToUTF8(), newDevName);
     
     thisObj->devName_ = newDevName;
     

src/pipeline/ToneInterfererStep.cpp

@@ -25,8 +25,9 @@
 #include <cmath>
 #include "ToneInterfererStep.h"
 
+// M_PI is not available on some compilers, so define it here just in case.
 #ifndef M_PI
-#define M_PI    3.14159265358979323846
+    #define M_PI 3.1415926535897932384626433832795
 #endif
 
 ToneInterfererStep::ToneInterfererStep(

src/pskreporter.cpp

@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-#ifdef WIN32
+#if defined(WIN32) || defined(__MINGW32__)
 #define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -16,7 +16,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#endif // WIN32
+#endif // defined(WIN32) || defined(__MINGW32__)
 
 #include "pskreporter.h"