From: Vinod Koul Date: Mon, 16 Dec 2013 15:07:24 +0000 (+0530) Subject: tinycompress: remove usage of SNDRV_RATE_xxx X-Git-Tag: v1.1.0~22 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=6ca3d352147ce24508f6f2dbfb2db72ec1b85c08;p=tinycompress.git tinycompress: remove usage of SNDRV_RATE_xxx as now it is not to be used for passing the sampling rate Signed-off-by: Vinod Koul --- diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index 40de69a..e340cca 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -269,25 +269,5 @@ int is_compress_ready(struct compress *compress); /* Returns a human readable reason for the last error */ const char *compress_get_error(struct compress *compress); -/* - * since the SNDRV_PCM_RATE_* is not availble anywhere in userspace - * and we have used these to define the sampling rate, we need to define - * then here - */ -#define SNDRV_PCM_RATE_5512 (1<<0) /* 5512Hz */ -#define SNDRV_PCM_RATE_8000 (1<<1) /* 8000Hz */ -#define SNDRV_PCM_RATE_11025 (1<<2) /* 11025Hz */ -#define SNDRV_PCM_RATE_16000 (1<<3) /* 16000Hz */ -#define SNDRV_PCM_RATE_22050 (1<<4) /* 22050Hz */ -#define SNDRV_PCM_RATE_32000 (1<<5) /* 32000Hz */ -#define SNDRV_PCM_RATE_44100 (1<<6) /* 44100Hz */ -#define SNDRV_PCM_RATE_48000 (1<<7) /* 48000Hz */ -#define SNDRV_PCM_RATE_64000 (1<<8) /* 64000Hz */ -#define SNDRV_PCM_RATE_88200 (1<<9) /* 88200Hz */ -#define SNDRV_PCM_RATE_96000 (1<<10) /* 96000Hz */ -#define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */ -#define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */ -/* utility functions */ -unsigned int compress_get_alsa_rate(unsigned int rate); #endif diff --git a/utils.c b/utils.c index a835bef..9a0f86a 100644 --- a/utils.c +++ b/utils.c @@ -60,37 +60,3 @@ #define __user #include "tinycompress/tinycompress.h" - -unsigned int compress_get_alsa_rate(unsigned int rate) -{ - switch (rate) { - case 5512: - return SNDRV_PCM_RATE_5512; - case 8000: - return SNDRV_PCM_RATE_8000; - case 11025: - return SNDRV_PCM_RATE_11025; - case 16000: - return SNDRV_PCM_RATE_16000; - case 22050: - return SNDRV_PCM_RATE_22050; - case 32000: - return SNDRV_PCM_RATE_32000; - case 44100: - return SNDRV_PCM_RATE_44100; - case 48000: - return SNDRV_PCM_RATE_48000; - case 64000: - return SNDRV_PCM_RATE_64000; - case 88200: - return SNDRV_PCM_RATE_88200; - case 96000: - return SNDRV_PCM_RATE_96000; - case 176400: - return SNDRV_PCM_RATE_176400; - case 192000: - return SNDRV_PCM_RATE_192000; - default: - return 0; - } -}