From b475b6db454466d9cda1ee77d362d930337bb6d2 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Sat, 27 Mar 2021 21:29:47 +0100
Subject: [PATCH] Correctly returning the sample rate

---
 native/serverconnection/src/audio/driver/PortAudio.h         | 5 ++---
 .../serverconnection/src/audio/driver/PortAudioPlayback.cpp  | 4 ++--
 native/serverconnection/src/audio/driver/PortAudioRecord.cpp | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/native/serverconnection/src/audio/driver/PortAudio.h b/native/serverconnection/src/audio/driver/PortAudio.h
index 0e7b4fc..573a495 100644
--- a/native/serverconnection/src/audio/driver/PortAudio.h
+++ b/native/serverconnection/src/audio/driver/PortAudio.h
@@ -11,8 +11,7 @@ namespace tc::audio::pa {
     class PortAudioPlayback : public AudioDevicePlayback {
         public:
             static constexpr auto kChannelCount{2};
-            static constexpr auto kSampleRate{44100};
-            static constexpr auto kTimeSpan{0.01};
+            static constexpr auto kSampleRate{48000};
 
             explicit PortAudioPlayback(PaDeviceIndex index, const PaDeviceInfo* info);
             virtual ~PortAudioPlayback();
@@ -35,7 +34,7 @@ namespace tc::audio::pa {
     class PortAudioRecord : public AudioDeviceRecord {
         public:
             static constexpr auto kChannelCount{2};
-            static constexpr auto kSampleRate{44100};
+            static constexpr auto kSampleRate{48000};
 
             explicit PortAudioRecord(PaDeviceIndex index, const PaDeviceInfo* info);
             virtual ~PortAudioRecord();
diff --git a/native/serverconnection/src/audio/driver/PortAudioPlayback.cpp b/native/serverconnection/src/audio/driver/PortAudioPlayback.cpp
index 9845606..de22982 100644
--- a/native/serverconnection/src/audio/driver/PortAudioPlayback.cpp
+++ b/native/serverconnection/src/audio/driver/PortAudioPlayback.cpp
@@ -63,7 +63,7 @@ bool PortAudioPlayback::impl_start(std::string &error) {
             nullptr,
             &parameters,
             (double) kSampleRate,
-            (unsigned long) (kSampleRate * kTimeSpan),
+            paFramesPerBufferUnspecified,
             paClipOff,
             proxied_write_callback,
             this
@@ -100,7 +100,7 @@ void PortAudioPlayback::impl_stop() {
 }
 
 size_t PortAudioPlayback::sample_rate() const {
-    return (size_t) this->info->defaultSampleRate;
+    return (size_t) kSampleRate;
 }
 
 void PortAudioPlayback::write_callback(void *output, unsigned long frameCount,
diff --git a/native/serverconnection/src/audio/driver/PortAudioRecord.cpp b/native/serverconnection/src/audio/driver/PortAudioRecord.cpp
index b9c2d63..2103eeb 100644
--- a/native/serverconnection/src/audio/driver/PortAudioRecord.cpp
+++ b/native/serverconnection/src/audio/driver/PortAudioRecord.cpp
@@ -98,7 +98,7 @@ void PortAudioRecord::impl_stop() {
 }
 
 size_t PortAudioRecord::sample_rate() const {
-    return (size_t) this->info->defaultSampleRate;
+    return kSampleRate;
 }
 
 void PortAudioRecord::read_callback(const void *input, unsigned long frameCount,