mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-02 09:01:48 -05:00
Removed snd_ctl_pcm_surround_next_device function.
This commit is contained in:
parent
b8abb93bb7
commit
b72c78f887
10 changed files with 9 additions and 96 deletions
|
|
@ -289,19 +289,6 @@ int snd_ctl_pcm_next_device(snd_ctl_t *ctl, int * device)
|
|||
return ctl->ops->pcm_next_device(ctl, device);
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Get next PCM surround device number
|
||||
* \param ctl CTL handle
|
||||
* \param type surround type
|
||||
* \param device current device on entry and next device on return
|
||||
* \return 0 on success otherwise a negative error code
|
||||
*/
|
||||
int snd_ctl_pcm_surround_next_device(snd_ctl_t *ctl, snd_pcm_surround_type_t type, int * device)
|
||||
{
|
||||
assert(ctl && device);
|
||||
return ctl->ops->pcm_surround_next_device(ctl, type, device);
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Get info about a PCM device
|
||||
* \param ctl CTL handle
|
||||
|
|
|
|||
|
|
@ -203,13 +203,6 @@ static int snd_ctl_hw_pcm_next_device(snd_ctl_t *handle, int * device)
|
|||
return 0;
|
||||
}
|
||||
|
||||
extern int snd_pcm_surround_next_device(snd_ctl_t *ctl, snd_pcm_surround_type_t type, int *device);
|
||||
|
||||
static int snd_ctl_hw_pcm_surround_next_device(snd_ctl_t *handle, snd_pcm_surround_type_t type, int * device)
|
||||
{
|
||||
return snd_pcm_surround_next_device(handle, type, device);
|
||||
}
|
||||
|
||||
static int snd_ctl_hw_pcm_info(snd_ctl_t *handle, snd_pcm_info_t * info)
|
||||
{
|
||||
snd_ctl_hw_t *hw = handle->private_data;
|
||||
|
|
@ -276,7 +269,6 @@ snd_ctl_ops_t snd_ctl_hw_ops = {
|
|||
hwdep_next_device: snd_ctl_hw_hwdep_next_device,
|
||||
hwdep_info: snd_ctl_hw_hwdep_info,
|
||||
pcm_next_device: snd_ctl_hw_pcm_next_device,
|
||||
pcm_surround_next_device: snd_ctl_hw_pcm_surround_next_device,
|
||||
pcm_info: snd_ctl_hw_pcm_info,
|
||||
pcm_prefer_subdevice: snd_ctl_hw_pcm_prefer_subdevice,
|
||||
rawmidi_next_device: snd_ctl_hw_rawmidi_next_device,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ typedef struct _snd_ctl_ops {
|
|||
int (*hwdep_next_device)(snd_ctl_t *handle, int *device);
|
||||
int (*hwdep_info)(snd_ctl_t *handle, snd_hwdep_info_t * info);
|
||||
int (*pcm_next_device)(snd_ctl_t *handle, int *device);
|
||||
int (*pcm_surround_next_device)(snd_ctl_t *handle, snd_pcm_surround_type_t type, int *device);
|
||||
int (*pcm_info)(snd_ctl_t *handle, snd_pcm_info_t * info);
|
||||
int (*pcm_prefer_subdevice)(snd_ctl_t *handle, int subdev);
|
||||
int (*rawmidi_next_device)(snd_ctl_t *handle, int *device);
|
||||
|
|
|
|||
|
|
@ -277,21 +277,6 @@ static int snd_ctl_shm_pcm_next_device(snd_ctl_t *ctl, int * device)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int snd_ctl_shm_pcm_surround_next_device(snd_ctl_t *ctl, snd_pcm_surround_type_t type, int * device)
|
||||
{
|
||||
snd_ctl_shm_t *shm = ctl->private_data;
|
||||
volatile snd_ctl_shm_ctrl_t *ctrl = shm->ctrl;
|
||||
int err;
|
||||
ctrl->u.surround.type = type;
|
||||
ctrl->u.surround.device = *device;
|
||||
ctrl->cmd = SND_CTL_IOCTL_PCM_SURROUND_NEXT_DEVICE;
|
||||
err = snd_ctl_shm_action(ctl);
|
||||
if (err < 0)
|
||||
return err;
|
||||
*device = ctrl->u.device;
|
||||
return err;
|
||||
}
|
||||
|
||||
static int snd_ctl_shm_pcm_info(snd_ctl_t *ctl, snd_pcm_info_t * info)
|
||||
{
|
||||
snd_ctl_shm_t *shm = ctl->private_data;
|
||||
|
|
@ -395,7 +380,6 @@ snd_ctl_ops_t snd_ctl_shm_ops = {
|
|||
hwdep_next_device: snd_ctl_shm_hwdep_next_device,
|
||||
hwdep_info: snd_ctl_shm_hwdep_info,
|
||||
pcm_next_device: snd_ctl_shm_pcm_next_device,
|
||||
pcm_surround_next_device: snd_ctl_shm_pcm_surround_next_device,
|
||||
pcm_info: snd_ctl_shm_pcm_info,
|
||||
pcm_prefer_subdevice: snd_ctl_shm_pcm_prefer_subdevice,
|
||||
rawmidi_next_device: snd_ctl_shm_rawmidi_next_device,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue