mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed dig_info & dig_params..

Browse source
This commit is contained in:
Jaroslav Kysela 2000-12-21 21:52:40 +00:00
parent 8dd927e97f
commit c268a4bf56
22 changed files with 0 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

6
aserver/aserver.c
View file

@ -388,12 +388,6 @@ int pcm_shm_cmd(client_t *client)
case SND_PCM_IOCTL_SW_PARAMS:
ctrl->result = snd_pcm_sw_params(pcm, (snd_pcm_sw_params_t *) &ctrl->u.sw_params);
break;
case SND_PCM_IOCTL_DIG_PARAMS:
ctrl->result = snd_pcm_dig_params(pcm, (snd_pcm_dig_params_t *) &ctrl->u.dig_params);
break;
case SND_PCM_IOCTL_DIG_INFO:
ctrl->result = snd_pcm_dig_info(pcm, (snd_pcm_dig_info_t *) &ctrl->u.dig_info);
break;
case SND_PCM_IOCTL_STATUS:
ctrl->result = snd_pcm_status(pcm, (snd_pcm_status_t *) &ctrl->u.status);
break;

2
include/aserver.h
View file

@ -45,8 +45,6 @@ typedef struct {
snd_pcm_hw_params_t hw_refine;
snd_pcm_hw_params_t hw_params;
snd_pcm_sw_params_t sw_params;
snd_pcm_dig_params_t dig_params;
snd_pcm_dig_info_t dig_info;
snd_pcm_status_t status;
struct {
ssize_t frames;

2
include/pcm.h
View file

@ -59,8 +59,6 @@ int snd_pcm_async(snd_pcm_t *pcm, int sig, pid_t pid);
int snd_pcm_info(snd_pcm_t *pcm, snd_pcm_info_t *info);
int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
int snd_pcm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info);
int snd_pcm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params);
int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status);
int snd_pcm_prepare(snd_pcm_t *pcm);
int snd_pcm_reset(snd_pcm_t *pcm);

12
src/pcm/pcm.c
View file

@ -112,18 +112,6 @@ int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
return 0;
}
int snd_pcm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params)
{
assert(pcm && params);
return pcm->ops->dig_params(pcm->op_arg, params);
}
int snd_pcm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info)
{
assert(pcm && info);
return pcm->ops->dig_info(pcm->op_arg, info);
}
int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status)
{
assert(pcm && status);

2
src/pcm/pcm_adpcm.c
View file

@ -536,8 +536,6 @@ snd_pcm_ops_t snd_pcm_adpcm_ops = {
hw_refine: snd_pcm_adpcm_hw_refine,
hw_params: snd_pcm_adpcm_hw_params,
sw_params: snd_pcm_plugin_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_adpcm_dump,
nonblock: snd_pcm_plugin_nonblock,

2
src/pcm/pcm_alaw.c
View file

@ -404,8 +404,6 @@ snd_pcm_ops_t snd_pcm_alaw_ops = {
hw_refine: snd_pcm_alaw_hw_refine,
hw_params: snd_pcm_alaw_hw_params,
sw_params: snd_pcm_plugin_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_alaw_dump,
nonblock: snd_pcm_plugin_nonblock,

2
src/pcm/pcm_copy.c
View file

@ -162,8 +162,6 @@ snd_pcm_ops_t snd_pcm_copy_ops = {
hw_refine: snd_pcm_copy_hw_refine,
hw_params: snd_pcm_copy_hw_params,
sw_params: snd_pcm_plugin_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_copy_dump,
nonblock: snd_pcm_plugin_nonblock,

14
src/pcm/pcm_file.c
View file

@ -272,18 +272,6 @@ static int snd_pcm_file_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
return snd_pcm_sw_params(file->slave, params);
}
static int snd_pcm_file_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
{
snd_pcm_file_t *file = pcm->private;
return snd_pcm_dig_info(file->slave, info);
}
static int snd_pcm_file_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
{
snd_pcm_file_t *file = pcm->private;
return snd_pcm_dig_params(file->slave, params);
}
static int snd_pcm_file_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
{
snd_pcm_file_t *file = pcm->private;
@ -317,8 +305,6 @@ snd_pcm_ops_t snd_pcm_file_ops = {
hw_refine: snd_pcm_file_hw_refine,
hw_params: snd_pcm_file_hw_params,
sw_params: snd_pcm_file_sw_params,
dig_info: snd_pcm_file_dig_info,
dig_params: snd_pcm_file_dig_params,
channel_info: snd_pcm_file_channel_info,
dump: snd_pcm_file_dump,
nonblock: snd_pcm_file_nonblock,

24
src/pcm/pcm_hw.c
View file

@ -153,28 +153,6 @@ static int snd_pcm_hw_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
return 0;
}
static int snd_pcm_hw_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
{
snd_pcm_hw_t *hw = pcm->private;
int fd = hw->fd;
if (ioctl(fd, SND_PCM_IOCTL_DIG_INFO, info) < 0) {
SYSERR("SND_PCM_IOCTL_DIG_INFO failed");
return -errno;
}
return 0;
}
static int snd_pcm_hw_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
{
snd_pcm_hw_t *hw = pcm->private;
int fd = hw->fd;
if (ioctl(fd, SND_PCM_IOCTL_DIG_PARAMS, params) < 0) {
SYSERR("SND_PCM_IOCTL_DIG_PARAMS failed");
return -errno;
}
return 0;
}
static int snd_pcm_hw_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info)
{
snd_pcm_hw_t *hw = pcm->private;
@ -525,8 +503,6 @@ snd_pcm_ops_t snd_pcm_hw_ops = {
hw_refine: snd_pcm_hw_hw_refine,
hw_params: snd_pcm_hw_hw_params,
sw_params: snd_pcm_hw_sw_params,
dig_info: snd_pcm_hw_dig_info,
dig_params: snd_pcm_hw_dig_params,
channel_info: snd_pcm_hw_channel_info,
dump: snd_pcm_hw_dump,
nonblock: snd_pcm_hw_nonblock,

2
src/pcm/pcm_linear.c
View file

@ -243,8 +243,6 @@ snd_pcm_ops_t snd_pcm_linear_ops = {
hw_refine: snd_pcm_linear_hw_refine,
hw_params: snd_pcm_linear_hw_params,
sw_params: snd_pcm_plugin_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_linear_dump,
nonblock: snd_pcm_plugin_nonblock,

2
src/pcm/pcm_local.h
View file

@ -62,8 +62,6 @@ typedef struct {
int (*hw_refine)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
int (*hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
int (*sw_params)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
int (*dig_info)(snd_pcm_t *pcm, snd_pcm_dig_info_t *info);
int (*dig_params)(snd_pcm_t *pcm, snd_pcm_dig_params_t *params);
int (*channel_info)(snd_pcm_t *pcm, snd_pcm_channel_info_t *info);
void (*dump)(snd_pcm_t *pcm, FILE *fp);
int (*mmap)(snd_pcm_t *pcm);

2
src/pcm/pcm_mulaw.c
View file

@ -421,8 +421,6 @@ snd_pcm_ops_t snd_pcm_mulaw_ops = {
hw_refine: snd_pcm_mulaw_hw_refine,
hw_params: snd_pcm_mulaw_hw_params,
sw_params: snd_pcm_plugin_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_mulaw_dump,
nonblock: snd_pcm_plugin_nonblock,

14
src/pcm/pcm_multi.c
View file

@ -220,18 +220,6 @@ static int snd_pcm_multi_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
return 0;
}
static int snd_pcm_multi_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED)
{
/* FIXME */
return -ENOSYS;
}
static int snd_pcm_multi_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED)
{
/* FIXME */
return -ENOSYS;
}
static int snd_pcm_multi_status(snd_pcm_t *pcm, snd_pcm_status_t *status)
{
snd_pcm_multi_t *multi = pcm->private;
@ -406,8 +394,6 @@ snd_pcm_ops_t snd_pcm_multi_ops = {
hw_refine: snd_pcm_multi_hw_refine,
hw_params: snd_pcm_multi_hw_params,
sw_params: snd_pcm_multi_sw_params,
dig_info: snd_pcm_multi_dig_info,
dig_params: snd_pcm_multi_dig_params,
channel_info: snd_pcm_multi_channel_info,
dump: snd_pcm_multi_dump,
nonblock: snd_pcm_multi_nonblock,

13
src/pcm/pcm_null.c
View file

@ -234,7 +234,6 @@ static int snd_pcm_null_hw_refine(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_pa
{
_snd_pcm_hw_refine(params);
params->fifo_size = 0;
params->dig_groups = 0;
return 0;
}
@ -260,16 +259,6 @@ static int snd_pcm_null_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_pa
return 0;
}
static int snd_pcm_null_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED)
{
return 0;
}
static int snd_pcm_null_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED)
{
return 0;
}
static int snd_pcm_null_mmap(snd_pcm_t *pcm)
{
snd_pcm_null_t *null = pcm->private;
@ -310,8 +299,6 @@ snd_pcm_ops_t snd_pcm_null_ops = {
hw_refine: snd_pcm_null_hw_refine,
hw_params: snd_pcm_null_hw_params,
sw_params: snd_pcm_null_sw_params,
dig_params: snd_pcm_null_dig_params,
dig_info: snd_pcm_null_dig_info,
channel_info: snd_pcm_null_channel_info,
dump: snd_pcm_null_dump,
nonblock: snd_pcm_null_nonblock,

9
src/pcm/pcm_params.c
View file

@ -93,7 +93,6 @@ void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params)
interval_setreal(params_interval(params, SND_PCM_HW_PARAM_FRAGMENT_LENGTH));
interval_setreal(params_interval(params, SND_PCM_HW_PARAM_BUFFER_LENGTH));
params->info = ~0U;
params->dig_groups = UINT_MAX;
}
/* Fill PARAMS with full configuration space boundaries */
@ -606,14 +605,6 @@ int snd_pcm_hw_params_info_fifo_size(const snd_pcm_hw_params_t *params)
return params->fifo_size;
}
/* Return count of digital groups for configuration space defined by PARAMS */
int snd_pcm_hw_params_info_dig_groups(const snd_pcm_hw_params_t *params)
{
if (params->dig_groups == UINT_MAX)
return -EINVAL;
return params->dig_groups;
}
/* Choose one configuration from configuration space defined by PARAMS
The configuration choosen is that obtained fixing in this order:
first access

15
src/pcm/pcm_plug.c
View file

@ -620,19 +620,6 @@ static int snd_pcm_plug_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
return err;
}
static int snd_pcm_plug_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
{
snd_pcm_plug_t *plug = pcm->private;
return snd_pcm_dig_info(plug->slave, info);
}
static int snd_pcm_plug_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
{
snd_pcm_plug_t *plug = pcm->private;
return snd_pcm_dig_params(plug->slave, params);
}
static int snd_pcm_plug_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
{
snd_pcm_plug_t *plug = pcm->private;
@ -662,8 +649,6 @@ snd_pcm_ops_t snd_pcm_plug_ops = {
hw_refine: snd_pcm_plug_hw_refine,
hw_params: snd_pcm_plug_hw_params,
sw_params: snd_pcm_plug_sw_params,
dig_info: snd_pcm_plug_dig_info,
dig_params: snd_pcm_plug_dig_params,
channel_info: snd_pcm_plug_channel_info,
dump: snd_pcm_plug_dump,
nonblock: snd_pcm_plug_nonblock,

12
src/pcm/pcm_plugin.c
View file

@ -58,18 +58,6 @@ int snd_pcm_plugin_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
return snd_pcm_sw_params(plugin->slave, params);
}
int snd_pcm_plugin_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info)
{
snd_pcm_plugin_t *plugin = pcm->private;
return snd_pcm_dig_info(plugin->slave, info);
}
int snd_pcm_plugin_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params)
{
snd_pcm_plugin_t *plugin = pcm->private;
return snd_pcm_dig_params(plugin->slave, params);
}
int snd_pcm_plugin_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
{
snd_pcm_plugin_t *plugin = pcm->private;

2
src/pcm/pcm_plugin.h
View file

@ -35,8 +35,6 @@ 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);
int snd_pcm_plugin_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
int snd_pcm_plugin_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info);
int snd_pcm_plugin_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params);
int snd_pcm_plugin_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info);
int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status);
int snd_pcm_plugin_state(snd_pcm_t *pcm);

2
src/pcm/pcm_rate.c
View file

@ -515,8 +515,6 @@ snd_pcm_ops_t snd_pcm_rate_ops = {
hw_refine: snd_pcm_rate_hw_refine,
hw_params: snd_pcm_rate_hw_params,
sw_params: snd_pcm_rate_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_rate_dump,
nonblock: snd_pcm_plugin_nonblock,

2
src/pcm/pcm_route.c
View file

@ -664,8 +664,6 @@ snd_pcm_ops_t snd_pcm_route_ops = {
hw_refine: snd_pcm_route_hw_refine,
hw_params: snd_pcm_route_hw_params,
sw_params: snd_pcm_plugin_sw_params,
dig_info: snd_pcm_plugin_dig_info,
dig_params: snd_pcm_plugin_dig_params,
channel_info: snd_pcm_plugin_channel_info,
dump: snd_pcm_route_dump,
nonblock: snd_pcm_plugin_nonblock,

26
src/pcm/pcm_share.c
View file

@ -591,30 +591,6 @@ static int snd_pcm_share_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_p
return 0;
}
static int snd_pcm_share_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info)
{
snd_pcm_share_t *share = pcm->private;
snd_pcm_share_slave_t *slave = share->slave;
int err;
/* FIXME */
Pthread_mutex_lock(&slave->mutex);
err = snd_pcm_dig_info(slave->pcm, info);
Pthread_mutex_unlock(&slave->mutex);
return err;
}
static int snd_pcm_share_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params)
{
snd_pcm_share_t *share = pcm->private;
snd_pcm_share_slave_t *slave = share->slave;
int err;
/* FIXME */
Pthread_mutex_lock(&slave->mutex);
err = snd_pcm_dig_params(slave->pcm, params);
Pthread_mutex_unlock(&slave->mutex);
return err;
}
static int snd_pcm_share_status(snd_pcm_t *pcm, snd_pcm_status_t *status)
{
snd_pcm_share_t *share = pcm->private;
@ -1110,8 +1086,6 @@ snd_pcm_ops_t snd_pcm_share_ops = {
hw_refine: snd_pcm_share_hw_refine,
hw_params: snd_pcm_share_hw_params,
sw_params: snd_pcm_share_sw_params,
dig_info: snd_pcm_share_dig_info,
dig_params: snd_pcm_share_dig_params,
channel_info: snd_pcm_share_channel_info,
dump: snd_pcm_share_dump,
nonblock: snd_pcm_share_nonblock,

30
src/pcm/pcm_shm.c
View file

@ -217,34 +217,6 @@ static int snd_pcm_shm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
return err;
}
static int snd_pcm_shm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
{
snd_pcm_shm_t *shm = pcm->private;
volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
int err;
ctrl->cmd = SND_PCM_IOCTL_DIG_INFO;
ctrl->u.dig_info = *info;
err = snd_pcm_shm_action(pcm);
if (err < 0)
return err;
*info = ctrl->u.dig_info;
return err;
}
static int snd_pcm_shm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
{
snd_pcm_shm_t *shm = pcm->private;
volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
int err;
ctrl->cmd = SND_PCM_IOCTL_DIG_PARAMS;
ctrl->u.dig_params = *params;
err = snd_pcm_shm_action(pcm);
*params = ctrl->u.dig_params;
if (err < 0)
return err;
return err;
}
static int snd_pcm_shm_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
{
return 0;
@ -474,8 +446,6 @@ snd_pcm_ops_t snd_pcm_shm_ops = {
hw_refine: snd_pcm_shm_hw_refine,
hw_params: snd_pcm_shm_hw_params,
sw_params: snd_pcm_shm_sw_params,
dig_info: snd_pcm_shm_dig_info,
dig_params: snd_pcm_shm_dig_params,
channel_info: snd_pcm_shm_channel_info,
dump: snd_pcm_shm_dump,
nonblock: snd_pcm_shm_nonblock,