diff --git a/.github/workflows/build-project-win.yml b/.github/workflows/build-project-win.yml index ce37fc62..419f06e7 100644 --- a/.github/workflows/build-project-win.yml +++ b/.github/workflows/build-project-win.yml @@ -40,10 +40,16 @@ jobs: pip install numpy pip install structlog pip install colorama - pip install sounddevice + # pip install sounddevice # curl.exe --output PyAudio-0.2.11-cp39-cp39-win_amd64.whl --url https://download.lfd.uci.edu/pythonlibs/y2rycu7g/PyAudio-0.2.11-cp39-cp39-win_amd64.whl # pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl + - name: Install Sounddevice + if: matrix.os == 'windows-latest' + working-directory: tnc/lib/sounddevice/windows + run: | + pip install sounddevice-0.4.4-cp39-cp39-win_amd64.whl + - name: Install Pyaudio if: matrix.os == 'windows-latest' working-directory: tnc/lib/pyaudio/windows diff --git a/gui/main.js b/gui/main.js index 74fd81ef..cc0e4ce2 100644 --- a/gui/main.js +++ b/gui/main.js @@ -213,8 +213,12 @@ function createWindow() { // Emitted when the window is closed. logViewer.on('close', function(evt) { + if (logViewer !== null){ evt.preventDefault(); logViewer.hide(); + } else { + this.close() + } }) diff --git a/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp310-cp310-win32.whl b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp310-cp310-win32.whl new file mode 100644 index 00000000..e8b31731 Binary files /dev/null and b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp310-cp310-win32.whl differ diff --git a/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp310-cp310-win_amd64.whl b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp310-cp310-win_amd64.whl new file mode 100644 index 00000000..64d623cf Binary files /dev/null and b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp310-cp310-win_amd64.whl differ diff --git a/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp39-cp39-win32.whl b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp39-cp39-win32.whl new file mode 100644 index 00000000..581728b1 Binary files /dev/null and b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp39-cp39-win32.whl differ diff --git a/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp39-cp39-win_amd64.whl b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp39-cp39-win_amd64.whl new file mode 100644 index 00000000..f961157a Binary files /dev/null and b/tnc/lib/sounddevice/windows/sounddevice-0.4.4-cp39-cp39-win_amd64.whl differ diff --git a/tnc/modem.py b/tnc/modem.py index 2df4edc9..91112c30 100644 --- a/tnc/modem.py +++ b/tnc/modem.py @@ -164,7 +164,7 @@ class RF(): stream_callback=self.audio_callback ) ''' - self.stream = sd.RawStream(channels=self.AUDIO_CHANNELS, dtype='int16', callback=self.callback, device=static.AUDIO_OUTPUT_DEVICE, samplerate = self.AUDIO_SAMPLE_RATE_RX, blocksize=4800) + self.stream = sd.RawStream(channels=1, dtype='int16', callback=self.callback, device=static.AUDIO_OUTPUT_DEVICE, samplerate = self.AUDIO_SAMPLE_RATE_RX, blocksize=4800) self.stream.start() atexit.register(self.stream.stop)