From a2b5db00037bd4e0604643eaa67e7a0dd978bb8a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 27 Mar 2012 01:18:53 +0200 Subject: audio_format: remove SAMPLE_FORMAT_DSD_OVER_USB DSD-over-USB should not be a MPD core format, because it is not a "natural" format; it is just a temnporary over-the-wire format. This format has been implemented in pcm_export, and does not need to be supported by pcm_convert. --- src/audio_format.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/audio_format.c') diff --git a/src/audio_format.c b/src/audio_format.c index 73b11096a..45d94a853 100644 --- a/src/audio_format.c +++ b/src/audio_format.c @@ -29,15 +29,6 @@ audio_format_mask_apply(struct audio_format *af, assert(audio_format_valid(af)); assert(audio_format_mask_valid(mask)); - if (af->format == SAMPLE_FORMAT_DSD && - mask->format == SAMPLE_FORMAT_DSD_OVER_USB && - mask->sample_rate == 0) - /* each DSD-over-USB sample contains 2 DSD bytes (16 - DSD bits), which means the sample rate must be - halved; this is not the real 1 bit sample rate, but - MPD's point of view */ - af->sample_rate /= 2; - if (mask->sample_rate != 0) af->sample_rate = mask->sample_rate; @@ -74,9 +65,6 @@ sample_format_to_string(enum sample_format format) case SAMPLE_FORMAT_DSD: return "dsd"; - - case SAMPLE_FORMAT_DSD_OVER_USB: - return "dsdusb"; } /* unreachable */ -- cgit v1.2.3