summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-04-14 21:08:14 +0000
committerCarl Hetherington <cth@carlh.net>2019-04-15 01:04:44 +0100
commit6c4ba247bc27d55ed16b012225acd10d485c1f48 (patch)
tree471f8a1d9823cc7e5f5f580bb1b2dadbc4385ece /src
parentcb7226f045e32c0a081f5ba9f36220b0ade0af30 (diff)
Allow WASAPI or DS as the Windows sound API as DirectSound (at
least with RtAudio) does not seem to support > 2 channels.
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_viewer.cc1
-rw-r--r--src/wx/wx_util.h2
2 files changed, 2 insertions, 1 deletions
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