aboutsummaryrefslogtreecommitdiffstats
path: root/src/audio_format.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-03-27 01:18:53 +0200
committerMax Kellermann <max@duempel.org>2012-03-27 01:22:50 +0200
commita2b5db00037bd4e0604643eaa67e7a0dd978bb8a (patch)
tree9da34480c749136e581f91c0a3b4086e330085c2 /src/audio_format.c
parent2803ec2e96096dfc461f3e9a522e27b23453d076 (diff)
downloadmpd-a2b5db00037bd4e0604643eaa67e7a0dd978bb8a.tar.gz
mpd-a2b5db00037bd4e0604643eaa67e7a0dd978bb8a.tar.xz
mpd-a2b5db00037bd4e0604643eaa67e7a0dd978bb8a.zip
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.
Diffstat (limited to 'src/audio_format.c')
-rw-r--r--src/audio_format.c12
1 files changed, 0 insertions, 12 deletions
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 */