From 6c4ba247bc27d55ed16b012225acd10d485c1f48 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Apr 2019 21:08:14 +0000 Subject: [PATCH] Allow WASAPI or DS as the Windows sound API as DirectSound (at least with RtAudio) does not seem to support > 2 channels. --- src/wx/film_viewer.cc | 1 + src/wx/wx_util.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index b728f6b2a..e7b338409 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -652,6 +652,7 @@ FilmViewer::config_changed (Config::Property p) } _audio_channels = _audio.getDeviceInfo(st).outputChannels; + cout << "Opening stream " << st << "(" << _audio.getDeviceInfo(st).name << ") probed=" << _audio.getDeviceInfo(st).probed << " with " << _audio_channels << "\n"; RtAudio::StreamParameters sp; sp.deviceId = st; diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index d6de3b427..920d6f244 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -58,7 +58,7 @@ class wxSplashScreen; #define DCPOMATIC_RTAUDIO_API RtAudio::LINUX_PULSE #endif #ifdef DCPOMATIC_WINDOWS -#define DCPOMATIC_RTAUDIO_API RtAudio::WINDOWS_DS +#define DCPOMATIC_RTAUDIO_API RtAudio::UNSPECIFIED #endif #ifdef DCPOMATIC_OSX #define DCPOMATIC_RTAUDIO_API RtAudio::MACOSX_CORE -- 2.30.2