New upstream version 2.2.1+ds

diff --git a/docs/changelog.yml b/docs/changelog.yml
index 5e28460d42730b6482b562a1dc1c6a1397fae398..0d888b45ab95069dbe8db8e7de0506546fed3b1c 100644 (file)
--- a/docs/changelog.yml
+++ b/docs/changelog.yml
@@ -1,3 +1,7 @@
+- Version: "2.2.1"
+  Date: 2024-01-29
+  Description:
+  - (fixed) Sample rate issues with certain Windows ASIO drivers
 - Version: "2.2.0"
   Date: 2024-01-22
   Description:

diff --git a/src/gui/vsAudio.cpp b/src/gui/vsAudio.cpp
index 0244771ab572278ac7dd5888823d0e826f0c887c..ef4ebede57f09ad7d46e406d840d7e2ccf78f94f 100644 (file)
--- a/src/gui/vsAudio.cpp
+++ b/src/gui/vsAudio.cpp
@@ -891,7 +891,7 @@ AudioInterface* VsAudio::newJackAudioInterface([[maybe_unused]] JackTrip* jackTr
 #if defined(__unix__)
         AudioInterface::setPipewireLatency(
             getBufferSize(),
-            jackTripPtr == nullptr ? 44100 : jackTripPtr->getSampleRate());
+            jackTripPtr == nullptr ? 48000 : jackTripPtr->getSampleRate());
 #endif
         ifPtr->setup(true);
     }
@@ -919,7 +919,7 @@ AudioInterface* VsAudio::newRtAudioInterface([[maybe_unused]] JackTrip* jackTrip
         inputChans, outputChans,
         static_cast<AudioInterface::inputMixModeT>(getInputMixMode()),
         m_audioBitResolution, jackTripPtr != nullptr, jackTripPtr);
-    ifPtr->setSampleRate(jackTripPtr == nullptr ? 44100 : jackTripPtr->getSampleRate());
+    ifPtr->setSampleRate(jackTripPtr == nullptr ? 48000 : jackTripPtr->getSampleRate());
     ifPtr->setInputDevice(getInputDevice().toStdString());
     ifPtr->setOutputDevice(getOutputDevice().toStdString());
     ifPtr->setBufferSizeInSamples(getBufferSize());

diff --git a/src/jacktrip_globals.h b/src/jacktrip_globals.h
index bebe0988d3668169370e343b10383b94012ba545..5e85b542279edf66c3ea4716d5885bb5fa6199be 100644 (file)
--- a/src/jacktrip_globals.h
+++ b/src/jacktrip_globals.h
@@ -40,7 +40,7 @@
 
 #include "AudioInterface.h"
 
-constexpr const char* const gVersion = "2.2.0";  ///< JackTrip version
+constexpr const char* const gVersion = "2.2.1";  ///< JackTrip version
 
 //*******************************************************************************
 /// \name Default Values