Added snd_*_card() functions.

aserver/aserver.c

@@ -373,6 +373,10 @@ int pcm_shm_cmd(client_t *client)
 	ctrl->cmd = 0;
 	pcm = client->device.pcm.handle;
 	switch (cmd) {
+	case SND_PCM_IOCTL_CARD:
+		ctrl->result = 0;
+		ctrl->u.card = snd_pcm_card(pcm);
+		break;
 	case SND_PCM_IOCTL_ASYNC:
 		ctrl->result = snd_pcm_async(pcm, ctrl->u.async.sig, ctrl->u.async.pid);
 		break;
@@ -627,6 +631,9 @@ 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:
 		ctrl->result = 0;
 		return shm_ack_fd(client, snd_ctl_poll_descriptor(ctl));

include/aserver.h

@@ -21,15 +21,16 @@
 
 #include "../src/pcm/pcm_local.h"
 
-#define SND_PCM_IOCTL_STATE		_IO ('A', 0xf0)
+#define SND_PCM_IOCTL_CARD		_IO ('A', 0xf0)
-#define SND_PCM_IOCTL_MMAP		_IO ('A', 0xf1)
+#define SND_PCM_IOCTL_STATE		_IO ('A', 0xf1)
-#define SND_PCM_IOCTL_MUNMAP		_IO ('A', 0xf4)
+#define SND_PCM_IOCTL_MMAP		_IO ('A', 0xf2)
-#define SND_PCM_IOCTL_MMAP_FORWARD	_IO ('A', 0xf7)
+#define SND_PCM_IOCTL_MUNMAP		_IO ('A', 0xf3)
-#define SND_PCM_IOCTL_AVAIL_UPDATE	_IO ('A', 0xf8)
+#define SND_PCM_IOCTL_MMAP_FORWARD	_IO ('A', 0xf4)
-#define SND_PCM_IOCTL_ASYNC		_IO ('A', 0xf9)
+#define SND_PCM_IOCTL_AVAIL_UPDATE	_IO ('A', 0xf5)
-#define SND_PCM_IOCTL_CLOSE		_IO ('A', 0xfa)
+#define SND_PCM_IOCTL_ASYNC		_IO ('A', 0xf6)
-#define SND_PCM_IOCTL_POLL_DESCRIPTOR	_IO ('A', 0xfc)
+#define SND_PCM_IOCTL_CLOSE		_IO ('A', 0xf7)
-#define SND_PCM_IOCTL_SET_AVAIL_MIN	_IO ('A', 0xfd)
+#define SND_PCM_IOCTL_POLL_DESCRIPTOR	_IO ('A', 0xf8)
+#define SND_PCM_IOCTL_SET_AVAIL_MIN	_IO ('A', 0xf9)
 
 typedef struct {
 	long result;
@@ -37,6 +38,7 @@ typedef struct {
 	size_t hw_ptr;
 	size_t appl_ptr;
 	union {
+		int card;
 		struct {
 			int sig;
 			pid_t pid;
@@ -71,9 +73,10 @@ typedef struct {
 
 #define PCM_SHM_SIZE sizeof(snd_pcm_shm_ctrl_t)
 		
-#define SND_CTL_IOCTL_READ		_IOR('U', 0xf0, snd_ctl_event_t)
+#define SND_CTL_IOCTL_CARD		_IO ('U', 0xf0)
-#define SND_CTL_IOCTL_CLOSE		_IO ('U', 0xf1)
+#define SND_CTL_IOCTL_READ		_IOR('U', 0xf1, snd_ctl_event_t)
-#define SND_CTL_IOCTL_POLL_DESCRIPTOR	_IO ('U', 0xf2)
+#define SND_CTL_IOCTL_CLOSE		_IO ('U', 0xf2)
+#define SND_CTL_IOCTL_POLL_DESCRIPTOR	_IO ('U', 0xf3)
 
 typedef struct {
 	int result;

include/control.h

@@ -42,6 +42,7 @@ int snd_defaults_rawmidi_device(void);
 snd_ctl_type_t snd_ctl_type(snd_ctl_t *handle);
 int snd_ctl_open(snd_ctl_t **handle, char *name);
 int snd_ctl_close(snd_ctl_t *handle);
+int snd_ctl_card(snd_ctl_t *handle);
 int snd_ctl_poll_descriptor(snd_ctl_t *handle);
 int snd_ctl_hw_info(snd_ctl_t *handle, snd_ctl_hw_info_t *info);
 int snd_ctl_clist(snd_ctl_t *handle, snd_control_list_t * list);

include/mixer.h

@@ -13,6 +13,7 @@ extern "C" {
 
 int snd_mixer_open(snd_mixer_t **handle, char *name);
 int snd_mixer_close(snd_mixer_t *handle);
+int snd_mixer_card(snd_mixer_t *handle);
 int snd_mixer_poll_descriptor(snd_mixer_t *handle);
 
 #ifdef __cplusplus

include/pcm.h

@@ -53,6 +53,7 @@ ssize_t snd_pcm_readv(snd_pcm_t *pcm, const struct iovec *vector, int count);
 
 snd_pcm_type_t snd_pcm_type(snd_pcm_t *pcm);
 int snd_pcm_close(snd_pcm_t *pcm);
+int snd_pcm_card(snd_pcm_t *pcm);
 int snd_pcm_poll_descriptor(snd_pcm_t *pcm);
 int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock);
 int snd_pcm_async(snd_pcm_t *pcm, int sig, pid_t pid);

include/rawmidi.h

@@ -26,6 +26,7 @@ typedef enum _snd_rawmidi_type {
 
 int snd_rawmidi_open(snd_rawmidi_t **handle, char *name, int streams, int mode);
 int snd_rawmidi_close(snd_rawmidi_t *handle);
+int snd_rawmidi_card(snd_rawmidi_t *handle);
 int snd_rawmidi_poll_descriptor(snd_rawmidi_t *handle);
 int snd_rawmidi_nonblock(snd_rawmidi_t *handle, int nonblock);
 int snd_rawmidi_info(snd_rawmidi_t *handle, snd_rawmidi_info_t * info);

src/control/control.c

@@ -45,6 +45,12 @@ int snd_ctl_close(snd_ctl_t *ctl)
 	return res;
 }
 
+int snd_ctl_card(snd_ctl_t *ctl)
+{
+	assert(ctl);
+	return ctl->ops->card(ctl);
+}
+
 int snd_ctl_poll_descriptor(snd_ctl_t *ctl)
 {
 	assert(ctl);

src/control/control_hw.c

@@ -48,6 +48,12 @@ static int snd_ctl_hw_close(snd_ctl_t *handle)
 	return res;
 }
 
+static int snd_ctl_hw_card(snd_ctl_t *handle)
+{
+	snd_ctl_hw_t *hw = handle->private;
+	return hw->card;
+}
+
 static int snd_ctl_hw_poll_descriptor(snd_ctl_t *handle)
 {
 	snd_ctl_hw_t *hw = handle->private;
@@ -166,6 +172,7 @@ static int snd_ctl_hw_read(snd_ctl_t *handle, snd_ctl_event_t *event)
 
 snd_ctl_ops_t snd_ctl_hw_ops = {
 	close: snd_ctl_hw_close,
+	card: snd_ctl_hw_card,
 	poll_descriptor: snd_ctl_hw_poll_descriptor,
 	hw_info: snd_ctl_hw_hw_info,
 	clist: snd_ctl_hw_clist,

src/control/control_local.h

@@ -33,6 +33,7 @@
 
 typedef struct {
 	int (*close)(snd_ctl_t *handle);
+	int (*card)(snd_ctl_t *handle);
 	int (*poll_descriptor)(snd_ctl_t *handle);
 	int (*hw_info)(snd_ctl_t *handle, snd_ctl_hw_info_t *info);
 	int (*clist)(snd_ctl_t *handle, snd_control_list_t *list);

src/control/control_shm.c

@@ -95,6 +95,18 @@ static int snd_ctl_shm_close(snd_ctl_t *ctl)
 	return result;
 }
 
+static int snd_ctl_shm_card(snd_ctl_t *ctl)
+{
+	snd_ctl_shm_t *shm = ctl->private;
+	snd_ctl_shm_ctrl_t *ctrl = shm->ctrl;
+	int card, err;
+	ctrl->cmd = SND_CTL_IOCTL_CARD;
+	err = snd_ctl_shm_action_fd(ctl, &card);
+	if (err < 0)
+		return err;
+	return card;
+}
+
 static int snd_ctl_shm_poll_descriptor(snd_ctl_t *ctl)
 {
 	snd_ctl_shm_t *shm = ctl->private;
@@ -310,6 +322,7 @@ static int snd_ctl_shm_read(snd_ctl_t *ctl, snd_ctl_event_t *event)
 
 snd_ctl_ops_t snd_ctl_shm_ops = {
 	close: snd_ctl_shm_close,
+	card: snd_ctl_shm_card,
 	poll_descriptor: snd_ctl_shm_poll_descriptor,
 	hw_info: snd_ctl_shm_hw_info,
 	clist: snd_ctl_shm_clist,

src/pcm/pcm.c

@@ -261,6 +261,12 @@ ssize_t snd_pcm_readv(snd_pcm_t *pcm, const struct iovec *vector, int count)
 	return snd_pcm_readn(pcm, bufs, vector[0].iov_len);
 }
 
+int snd_pcm_card(snd_pcm_t *pcm)
+{
+	assert(pcm);
+	return pcm->ops->card(pcm->op_arg);
+}
+
 /* FIXME */
 #define snd_pcm_link_descriptor snd_pcm_poll_descriptor
 

src/pcm/pcm_adpcm.c

@@ -532,6 +532,7 @@ static void snd_pcm_adpcm_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_adpcm_ops = {
 	close: snd_pcm_adpcm_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_adpcm_hw_refine,
 	hw_params: snd_pcm_adpcm_hw_params,

src/pcm/pcm_alaw.c

@@ -400,6 +400,7 @@ static void snd_pcm_alaw_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_alaw_ops = {
 	close: snd_pcm_plugin_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_alaw_hw_refine,
 	hw_params: snd_pcm_alaw_hw_params,

src/pcm/pcm_copy.c

@@ -158,6 +158,7 @@ static void snd_pcm_copy_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_copy_ops = {
 	close: snd_pcm_plugin_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_copy_hw_refine,
 	hw_params: snd_pcm_copy_hw_params,

src/pcm/pcm_file.c

@@ -49,6 +49,12 @@ static int snd_pcm_file_close(snd_pcm_t *pcm)
 	return 0;
 }
 
+static int snd_pcm_file_card(snd_pcm_t *pcm)
+{
+	snd_pcm_file_t *file = pcm->private;
+	return snd_pcm_card(file->slave);
+}
+
 static int snd_pcm_file_nonblock(snd_pcm_t *pcm, int nonblock)
 {
 	snd_pcm_file_t *file = pcm->private;
@@ -301,6 +307,7 @@ static void snd_pcm_file_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_file_ops = {
 	close: snd_pcm_file_close,
+	card: snd_pcm_file_card,
 	info: snd_pcm_file_info,
 	hw_refine: snd_pcm_file_hw_refine,
 	hw_params: snd_pcm_file_hw_params,

src/pcm/pcm_hw.c

@@ -109,6 +109,12 @@ static int snd_pcm_hw_async(snd_pcm_t *pcm, int sig, pid_t pid)
 	return 0;
 }
 
+static int snd_pcm_hw_card(snd_pcm_t *pcm)
+{
+	snd_pcm_hw_t *hw = pcm->private;
+	return hw->card;
+}
+
 static int snd_pcm_hw_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
 {
 	snd_pcm_hw_t *hw = pcm->private;
@@ -499,6 +505,7 @@ static void snd_pcm_hw_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_hw_ops = {
 	close: snd_pcm_hw_close,
+	card: snd_pcm_hw_card,
 	info: snd_pcm_hw_info,
 	hw_refine: snd_pcm_hw_hw_refine,
 	hw_params: snd_pcm_hw_hw_params,

src/pcm/pcm_linear.c

@@ -239,6 +239,7 @@ static void snd_pcm_linear_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_linear_ops = {
 	close: snd_pcm_plugin_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_linear_hw_refine,
 	hw_params: snd_pcm_linear_hw_params,

src/pcm/pcm_local.h

@@ -56,6 +56,7 @@ typedef struct _snd_pcm_channel_info {
 
 typedef struct {
 	int (*close)(snd_pcm_t *pcm);
+	int (*card)(snd_pcm_t *pcm);
 	int (*nonblock)(snd_pcm_t *pcm, int nonblock);
 	int (*async)(snd_pcm_t *pcm, int sig, pid_t pid);
 	int (*info)(snd_pcm_t *pcm, snd_pcm_info_t *info);

src/pcm/pcm_mulaw.c

@@ -417,6 +417,7 @@ static void snd_pcm_mulaw_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_mulaw_ops = {
 	close: snd_pcm_plugin_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_mulaw_hw_refine,
 	hw_params: snd_pcm_mulaw_hw_params,

src/pcm/pcm_multi.c

@@ -67,6 +67,11 @@ static int snd_pcm_multi_close(snd_pcm_t *pcm)
 	return ret;
 }
 
+static int snd_pcm_multi_card(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
+{
+	return -ENOENT;	/* not available */
+}
+
 static int snd_pcm_multi_nonblock(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int nonblock ATTRIBUTE_UNUSED)
 {
 	return 0;
@@ -390,6 +395,7 @@ static void snd_pcm_multi_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_multi_ops = {
 	close: snd_pcm_multi_close,
+	card: snd_pcm_multi_card,
 	info: snd_pcm_multi_info,
 	hw_refine: snd_pcm_multi_hw_refine,
 	hw_params: snd_pcm_multi_hw_params,

src/pcm/pcm_null.c

@@ -42,6 +42,11 @@ static int snd_pcm_null_close(snd_pcm_t *pcm)
 	return 0;
 }
 
+static int snd_pcm_null_card(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
+{
+	return -ENOENT;	/* not available */
+}
+
 static int snd_pcm_null_nonblock(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int nonblock ATTRIBUTE_UNUSED)
 {
 	return 0;
@@ -295,6 +300,7 @@ static void snd_pcm_null_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_null_ops = {
 	close: snd_pcm_null_close,
+	card: snd_pcm_null_card,
 	info: snd_pcm_null_info,
 	hw_refine: snd_pcm_null_hw_refine,
 	hw_params: snd_pcm_null_hw_params,

src/pcm/pcm_plug.c

@@ -51,6 +51,12 @@ static int snd_pcm_plug_close(snd_pcm_t *pcm)
 	return result;
 }
 
+static int snd_pcm_plug_card(snd_pcm_t *pcm)
+{
+	snd_pcm_plug_t *plug = pcm->private;
+	return snd_pcm_card(plug->slave);
+}
+
 static int snd_pcm_plug_nonblock(snd_pcm_t *pcm, int nonblock)
 {
 	snd_pcm_plug_t *plug = pcm->private;
@@ -645,6 +651,7 @@ static void snd_pcm_plug_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_plug_ops = {
 	close: snd_pcm_plug_close,
+	card: snd_pcm_plug_card,
 	info: snd_pcm_plug_info,
 	hw_refine: snd_pcm_plug_hw_refine,
 	hw_params: snd_pcm_plug_hw_params,

src/pcm/pcm_plugin.c

@@ -34,6 +34,12 @@ int snd_pcm_plugin_close(snd_pcm_t *pcm)
 	return 0;
 }
 
+int snd_pcm_plugin_card(snd_pcm_t *pcm)
+{
+	snd_pcm_plugin_t *plugin = pcm->private;
+	return snd_pcm_card(plugin->slave);
+}
+
 int snd_pcm_plugin_nonblock(snd_pcm_t *pcm, int nonblock)
 {
 	snd_pcm_plugin_t *plugin = pcm->private;

src/pcm/pcm_plugin.h

@@ -31,6 +31,7 @@ typedef struct {
 } snd_pcm_plugin_t;	
 
 int snd_pcm_plugin_close(snd_pcm_t *pcm);
+int snd_pcm_plugin_card(snd_pcm_t *pcm);
 int snd_pcm_plugin_nonblock(snd_pcm_t *pcm, int nonblock);
 int snd_pcm_plugin_async(snd_pcm_t *pcm, int sig, pid_t pid);
 int snd_pcm_plugin_info(snd_pcm_t *pcm, snd_pcm_info_t * info);

src/pcm/pcm_rate.c

@@ -511,6 +511,7 @@ static void snd_pcm_rate_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_rate_ops = {
 	close: snd_pcm_rate_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_rate_hw_refine,
 	hw_params: snd_pcm_rate_hw_params,

src/pcm/pcm_route.c

@@ -660,6 +660,7 @@ static void snd_pcm_route_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_route_ops = {
 	close: snd_pcm_route_close,
+	card: snd_pcm_plugin_card,
 	info: snd_pcm_plugin_info,
 	hw_refine: snd_pcm_route_hw_refine,
 	hw_params: snd_pcm_route_hw_params,

src/pcm/pcm_share.c

@@ -417,6 +417,11 @@ static void _snd_pcm_share_update(snd_pcm_t *pcm)
 	}
 }
 
+static int snd_pcm_share_card(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
+{
+	return -ENOENT;	/* not available */
+}
+
 static int snd_pcm_share_nonblock(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int nonblock ATTRIBUTE_UNUSED)
 {
 	return 0;
@@ -1082,6 +1087,7 @@ static void snd_pcm_share_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_share_ops = {
 	close: snd_pcm_share_close,
+	card: snd_pcm_share_card,
 	info: snd_pcm_share_info,
 	hw_refine: snd_pcm_share_hw_refine,
 	hw_params: snd_pcm_share_hw_params,

src/pcm/pcm_shm.c

@@ -116,6 +116,18 @@ static int snd_pcm_shm_action_fd(snd_pcm_t *pcm, int *fd)
 	return ctrl->result;
 }
 
+static int snd_pcm_shm_card(snd_pcm_t *pcm)
+{
+	snd_pcm_shm_t *shm = pcm->private;
+	volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
+	int err;
+	ctrl->cmd = SND_PCM_IOCTL_CARD;
+	err = snd_pcm_shm_action(pcm);
+	if (err < 0)
+		return err;
+	return ctrl->u.card;
+}
+
 static int snd_pcm_shm_nonblock(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int nonblock ATTRIBUTE_UNUSED)
 {
 	return 0;
@@ -442,6 +454,7 @@ static void snd_pcm_shm_dump(snd_pcm_t *pcm, FILE *fp)
 
 snd_pcm_ops_t snd_pcm_shm_ops = {
 	close: snd_pcm_shm_close,
+	card: snd_pcm_shm_card,
 	info: snd_pcm_shm_info,
 	hw_refine: snd_pcm_shm_hw_refine,
 	hw_params: snd_pcm_shm_hw_params,

src/rawmidi/rawmidi.c

@@ -41,6 +41,12 @@ int snd_rawmidi_close(snd_rawmidi_t *rmidi)
 	return 0;
 }
 
+int snd_rawmidi_card(snd_rawmidi_t *rmidi)
+{
+	assert(rmidi);
+	return rmidi->ops->card(rmidi);
+}
+
 int snd_rawmidi_poll_descriptor(snd_rawmidi_t *rmidi)
 {
 	assert(rmidi);

src/rawmidi/rawmidi_hw.c

@@ -50,6 +50,12 @@ static int snd_rawmidi_hw_close(snd_rawmidi_t *rmidi)
 	return 0;
 }
 
+static int snd_rawmidi_hw_card(snd_rawmidi_t *rmidi)
+{
+	snd_rawmidi_hw_t *hw = rmidi->private;
+	return hw->card;
+}
+
 static int snd_rawmidi_hw_nonblock(snd_rawmidi_t *rmidi, int nonblock)
 {
 	snd_rawmidi_hw_t *hw = rmidi->private;
@@ -142,6 +148,7 @@ static ssize_t snd_rawmidi_hw_read(snd_rawmidi_t *rmidi, void *buffer, size_t si
 
 snd_rawmidi_ops_t snd_rawmidi_hw_ops = {
 	close: snd_rawmidi_hw_close,
+	card: snd_rawmidi_hw_card,
 	nonblock: snd_rawmidi_hw_nonblock,
 	info: snd_rawmidi_hw_info,
 	params: snd_rawmidi_hw_params,

src/rawmidi/rawmidi_local.h

@@ -36,6 +36,7 @@
 
 typedef struct {
 	int (*close)(snd_rawmidi_t *rawmidi);
+	int (*card)(snd_rawmidi_t *rawmidi);
 	int (*nonblock)(snd_rawmidi_t *rawmidi, int nonblock);
 	int (*info)(snd_rawmidi_t *rawmidi, snd_rawmidi_info_t *info);
 	int (*params)(snd_rawmidi_t *rawmidi, snd_rawmidi_params_t *params);