summaryrefslogtreecommitdiff
path: root/aserver
diff options
context:
space:
mode:
authorAbramo Bagnara <abramo@alsa-project.org>2000-12-23 16:13:38 +0000
committerAbramo Bagnara <abramo@alsa-project.org>2000-12-23 16:13:38 +0000
commitc1ad05163661cbf315cd3ebb5d40ba24322a4eac (patch)
tree93b53ca1823e33ed6370a7d410b1bb60f60de355 /aserver
parent80c3adaacec91eef3f93b21c95ad1cc5914a5320 (diff)
Fixed snd_*_card() wrt aserver
Diffstat (limited to 'aserver')
-rw-r--r--aserver/aserver.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/aserver/aserver.c b/aserver/aserver.c
index 5752dfd9..d9c8abbf 100644
--- a/aserver/aserver.c
+++ b/aserver/aserver.c
@@ -374,8 +374,7 @@ int pcm_shm_cmd(client_t *client)
pcm = client->device.pcm.handle;
switch (cmd) {
case SND_PCM_IOCTL_CARD:
- ctrl->result = 0;
- ctrl->u.card = snd_pcm_card(pcm);
+ ctrl->result = snd_pcm_card(pcm);
break;
case SND_PCM_IOCTL_ASYNC:
ctrl->result = snd_pcm_async(pcm, ctrl->u.async.sig, ctrl->u.async.pid);
@@ -631,10 +630,10 @@ int ctl_shm_cmd(client_t *client)
case SND_CTL_IOCTL_CLOSE:
client->ops->close(client);
break;
- case SND_PCM_IOCTL_CARD:
- ctrl->result = 0;
- return shm_ack_fd(client, snd_ctl_card(ctl));
- case SND_PCM_IOCTL_POLL_DESCRIPTOR:
+ case SND_CTL_IOCTL_CARD:
+ ctrl->result = snd_ctl_card(ctl);
+ break;
+ case SND_CTL_IOCTL_POLL_DESCRIPTOR:
ctrl->result = 0;
return shm_ack_fd(client, snd_ctl_poll_descriptor(ctl));
default: