oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/export: move Open() parameters to struct Params

Browse Source
This commit is contained in:
Max Kellermann
2016-02-26 18:54:13 +01:00
parent d3f0b62348
commit f0f3017a76
5 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/plugins/AlsaOutputPlugin.cxx
View File

@@ -716,22 +716,24 @@ AlsaOutput::SetupDop(const AudioFormat audio_format,
inline bool
AlsaOutput::SetupOrDop(AudioFormat &audio_format, Error &error)
{
bool shift8 = false, packed, reverse_endian;
PcmExport::Params params;
params.alsa_channel_order = true;
const bool dop2 = dop &&
audio_format.format == SampleFormat::DSD;
const bool success = dop2
params.dop = dop && audio_format.format == SampleFormat::DSD;
const bool success = params.dop
? SetupDop(audio_format,
&shift8, &packed, &reverse_endian,
&params.shift8,
&params.pack24, &params.reverse_endian,
error)
: alsa_setup(this, audio_format, &packed, &reverse_endian,
: alsa_setup(this, audio_format,
&params.pack24, &params.reverse_endian,
error);
if (!success)
return false;
pcm_export->Open(audio_format.format,
audio_format.channels,
true, dop2, shift8, packed, reverse_endian);
params);
return true;
}

11
src/output/plugins/OssOutputPlugin.cxx
View File

@@ -537,10 +537,13 @@ oss_probe_sample_format(int fd, SampleFormat sample_format,
*oss_format_r = oss_format;
#ifdef AFMT_S24_PACKED
pcm_export.Open(sample_format, 0, true, false, false,
oss_format == AFMT_S24_PACKED,
oss_format == AFMT_S24_PACKED &&
!IsLittleEndian());
PcmExport::Params params;
params.alsa_channel_order = true;
params.pack24 = oss_format == AFMT_S24_PACKED;
params.reverse_endian = oss_format == AFMT_S24_PACKED &&
!IsLittleEndian();
pcm_export.Open(sample_format, 0, params);
#endif
return SUCCESS;