Removed card type from devices info. Added card number to devices info. Completed encapsulation of PCM API. Removed snd_pcm_card(). All copy functions now have the form copy(dst, src).

src/control/bag.c

@@ -29,7 +29,6 @@
 #include <assert.h>
 #define __USE_GNU
 #include <search.h>
-#include "asoundlib.h"
 #include "control_local.h"
 
 int snd_ctl_hbag_create(void **bag)

src/control/cards.c

@@ -28,7 +28,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "control_local.h"
-#include "asoundlib.h"
 
 #define SND_FILE_CONTROL	"/dev/snd/controlC%i"
 #define SND_FILE_LOAD		"/dev/aloadC%i"

src/control/control.c

@@ -28,7 +28,6 @@
 #include <fcntl.h>
 #include <assert.h>
 #include <dlfcn.h>
-#include "asoundlib.h"
 #include "control_local.h"
 
 snd_ctl_type_t snd_ctl_type(snd_ctl_t *ctl)
@@ -45,12 +44,6 @@ 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

@@ -28,7 +28,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <assert.h>
-#include "asoundlib.h"
 #include "control_local.h"
 
 #define SNDRV_FILE_CONTROL	"/dev/snd/controlC%i"
@@ -48,12 +47,6 @@ 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;
@@ -172,7 +165,6 @@ 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

@@ -20,13 +20,11 @@
  */
 
 #include <assert.h>
-#include "asoundlib.h"
 #include "local.h"
 #include "list.h"
 
 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

@@ -34,8 +34,8 @@
 #include <sys/mman.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include "control_local.h"
 #include "aserver.h"
+#include "control_local.h"
 
 typedef struct {
 	int socket;
@@ -95,14 +95,6 @@ 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;
-	volatile snd_ctl_shm_ctrl_t *ctrl = shm->ctrl;
-	ctrl->cmd = SND_CTL_IOCTL_CARD;
-	return snd_ctl_shm_action(ctl);
-}
-
 static int snd_ctl_shm_poll_descriptor(snd_ctl_t *ctl)
 {
 	snd_ctl_shm_t *shm = ctl->private;
@@ -318,7 +310,6 @@ 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/control/controls.c

@@ -29,7 +29,6 @@
 #include <assert.h>
 #define __USE_GNU
 #include <search.h>
-#include "asoundlib.h"
 #include "control_local.h"
 
 static void snd_ctl_hfree1(snd_hcontrol_t *hcontrol);

src/control/defaults.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "asoundlib.h"
+#include "local.h"
 
 static int defaults_card(const char *env)
 {