Update to latest tinyalsa
2c3a8e2 Add -Wall to Makefile and fix warnings
4ef9a57 tinyplay: add clean shutdown handler for ctrl-c
9bb8066 Merge pull request #15 from quantumdream/master
bad2b79 tinymix: Add support for passing control name
f51c05b mixer: Add mixer_ctl_{set,get}_bytes()
fcf66ab Merge pull request #16 from PeterMalkin/master
3d62222 Add pcm_wait() to the tinyalsa API.
f9678dd tinyplay: Add missing header file <string.h>
cde1f6f Fix several 'symbol defined but not used' warnings.
2a274a1 pcm: Add support for S8 and S24LE formats.
a5baefd tinymix: support setting of multiple control values
Change-Id: I3d5fe076753ce7d1f74dd3ebedc59202d29f4efd
diff --git a/pcm.c b/pcm.c
index 284a7ac..d841bd9 100644
--- a/pcm.c
+++ b/pcm.c
@@ -93,14 +93,6 @@
}
}
-static void param_set_max(struct snd_pcm_hw_params *p, int n, unsigned int val)
-{
- if (param_is_interval(n)) {
- struct snd_interval *i = param_to_interval(p, n);
- i->max = val;
- }
-}
-
static void param_set_int(struct snd_pcm_hw_params *p, int n, unsigned int val)
{
if (param_is_interval(n)) {
@@ -190,6 +182,10 @@
switch (format) {
case PCM_FORMAT_S32_LE:
return SNDRV_PCM_FORMAT_S32_LE;
+ case PCM_FORMAT_S8:
+ return SNDRV_PCM_FORMAT_S8;
+ case PCM_FORMAT_S24_LE:
+ return SNDRV_PCM_FORMAT_S24_LE;
default:
case PCM_FORMAT_S16_LE:
return SNDRV_PCM_FORMAT_S16_LE;
@@ -741,7 +737,6 @@
int pcm_wait(struct pcm *pcm, int timeout)
{
struct pollfd pfd;
- unsigned short revents = 0;
int err;
pfd.fd = pcm->fd;
@@ -864,6 +859,5 @@
count -= frames;
}
-_end:
return 0;
}