diff options
author | Max Kellermann <max@duempel.org> | 2009-01-07 18:53:36 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-01-07 18:53:36 +0100 |
commit | b40428b3fd284f172da0ae630559176727026599 (patch) | |
tree | fd5399b38e5bf251e5459e01483bbc3cda01f832 /src/output | |
parent | 8b19c74e8eb0036c697010d56ed1ee9b92facb72 (diff) | |
download | mpd-b40428b3fd284f172da0ae630559176727026599.tar.gz mpd-b40428b3fd284f172da0ae630559176727026599.tar.xz mpd-b40428b3fd284f172da0ae630559176727026599.zip |
pcm_utils: moved conversion code to pcm_convert.c
All what's left in pcm_utils.h is the pcm_range() utility function,
which is only used internally by pcm_volume and pcm_mix.
Diffstat (limited to '')
-rw-r--r-- | src/output/alsa_plugin.c | 2 | ||||
-rw-r--r-- | src/output_control.c | 1 | ||||
-rw-r--r-- | src/output_internal.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index 0d97438eb..fc5c56c21 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -235,7 +235,7 @@ configure_hw: err = snd_pcm_hw_params_set_format(ad->pcmHandle, hwparams, bitformat); if (err == -EINVAL && audioFormat->bits != 16) { - /* fall back to 16 bit, let pcm_utils.c do the conversion */ + /* fall back to 16 bit, let pcm_convert.c do the conversion */ err = snd_pcm_hw_params_set_format(ad->pcmHandle, hwparams, SND_PCM_FORMAT_S16); if (err == 0) { diff --git a/src/output_control.c b/src/output_control.c index c0e7d001a..80cdf71d0 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -20,7 +20,6 @@ #include "output_api.h" #include "output_internal.h" #include "output_thread.h" -#include "pcm_utils.h" #include <assert.h> #include <stdlib.h> diff --git a/src/output_internal.h b/src/output_internal.h index 0cdbbdc2c..17209dd5a 100644 --- a/src/output_internal.h +++ b/src/output_internal.h @@ -20,7 +20,7 @@ #ifndef MPD_OUTPUT_INTERNAL_H #define MPD_OUTPUT_INTERNAL_H -#include "pcm_utils.h" +#include "pcm_convert.h" #include "notify.h" #include <time.h> |