Skip to content

M
mpd
Commit 59189160 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/wavpack: allow more than 2 channels

Remove the OPEN_2CH_MAX option. MPD's support for surround sound is still clunky, but we're working on it.
parent ee5d3337
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
NEWS
View file @ 59189160
......@@ -25,6 +25,7 @@ ver 0.16 (20??/??/??)
- sidplay: implemented songlength database
- sidplay: support seeking
- wavpack: activate 32 bit support
- wavpack: allow more than 2 channels
* encoders:
- twolame: new encoder plugin based on libtwolame
* output:
......
src/decoder/wavpack_plugin.c
View file @ 59189160
......@@ -139,7 +139,7 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek,
audio_format_init(&audio_format, WavpackGetSampleRate(wpc),
WavpackGetBitsPerSample(wpc),
WavpackGetReducedChannels(wpc));
WavpackGetNumChannels(wpc));
/* round bitwidth to 8-bit units */
audio_format.bits = (audio_format.bits + 7) & (~7);
......@@ -503,7 +503,7 @@ wavpack_streamdecode(struct decoder * decoder, struct input_stream *is)
char error[ERRORLEN];
WavpackContext *wpc;
struct input_stream is_wvc;
int open_flags = OPEN_2CH_MAX | OPEN_NORMALIZE;
int open_flags = OPEN_NORMALIZE;
struct wavpack_input isp, isp_wvc;
bool can_seek = is->seekable;
......@@ -548,7 +548,7 @@ wavpack_filedecode(struct decoder *decoder, const char *fname)
wpc = WavpackOpenFileInput(
fname, error,
OPEN_TAGS | OPEN_WVC | OPEN_2CH_MAX | OPEN_NORMALIZE, 23
OPEN_TAGS | OPEN_WVC | OPEN_NORMALIZE, 23
);
if (wpc == NULL) {
g_warning(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment