diff options
Diffstat (limited to 'src/output/jack_output_plugin.c')
| -rw-r--r-- | src/output/jack_output_plugin.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c index a24cb855..81a2ca3d 100644 --- a/src/output/jack_output_plugin.c +++ b/src/output/jack_output_plugin.c @@ -24,6 +24,9 @@ #include <assert.h> #include <glib.h> + +#include <libavutil/samplefmt.h> + #include <jack/jack.h> #include <jack/types.h> #include <jack/ringbuffer.h> @@ -197,9 +200,7 @@ set_audioformat(struct jack_data *jd, struct audio_format *audio_format) else if (audio_format->channels > jd->num_source_ports) audio_format->channels = 2; - if (audio_format->format != SAMPLE_FORMAT_S16 && - audio_format->format != SAMPLE_FORMAT_S24_P32) - audio_format->format = SAMPLE_FORMAT_S24_P32; + audio_format->format = AV_SAMPLE_FMT_S16; } static void @@ -657,16 +658,10 @@ mpd_jack_write_samples(struct jack_data *jd, const void *src, unsigned num_samples) { switch (jd->audio_format.format) { - case SAMPLE_FORMAT_S16: + case AV_SAMPLE_FMT_S16: mpd_jack_write_samples_16(jd, (const int16_t*)src, num_samples); break; - - case SAMPLE_FORMAT_S24_P32: - mpd_jack_write_samples_24(jd, (const int32_t*)src, - num_samples); - break; - default: assert(false); } |