summaryrefslogtreecommitdiff
path: root/www/iridium/files/audio_manager_openbsd.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2018-08-19 00:28:41 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2018-08-19 00:28:41 +0000
commit21b280784c769623287dfb3a658b7dc45dd5835d (patch)
treecdfd0c915eab48f5d22901eb3a7923dd548ba1e5 /www/iridium/files/audio_manager_openbsd.cc
parentUpdate to Wine 3.14. This includes the following changes: (diff)
- Unbreak build with SNDIO option [1]
- Cosmetic fix Reported by: starikarp@yandex.com via email [1]
Notes
Notes: svn path=/head/; revision=477549
Diffstat (limited to 'www/iridium/files/audio_manager_openbsd.cc')
-rw-r--r--www/iridium/files/audio_manager_openbsd.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/www/iridium/files/audio_manager_openbsd.cc b/www/iridium/files/audio_manager_openbsd.cc
index ee293b9d3791..1b021dd0833a 100644
--- a/www/iridium/files/audio_manager_openbsd.cc
+++ b/www/iridium/files/audio_manager_openbsd.cc
@@ -73,7 +73,7 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
return AudioParameters(
AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
- kDefaultSampleRate, buffer_size);
+ kDefaultSampleRate, 16, buffer_size);
}
AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
@@ -130,8 +130,10 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
int sample_rate = kDefaultSampleRate;
int buffer_size = kDefaultOutputBufferSize;
+ int bits_per_sample = 16;
if (input_params.IsValid()) {
sample_rate = input_params.sample_rate();
+ bits_per_sample = input_params.bits_per_sample();
channel_layout = input_params.channel_layout();
buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
}
@@ -142,7 +144,7 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
return AudioParameters(
AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
- sample_rate, buffer_size);
+ sample_rate, bits_per_sample, buffer_size);
}
AudioInputStream* AudioManagerOpenBSD::MakeInputStream(