mixer(3): Rename _mixer_readvol() to mixer_readvol()
No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week
This commit is contained in:
@@ -35,13 +35,11 @@
|
|||||||
|
|
||||||
#define BASEPATH "/dev/mixer"
|
#define BASEPATH "/dev/mixer"
|
||||||
|
|
||||||
static int _mixer_readvol(struct mix_dev *);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Fetch volume from the device.
|
* Fetch volume from the device.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
_mixer_readvol(struct mix_dev *dev)
|
mixer_readvol(struct mix_dev *dev)
|
||||||
{
|
{
|
||||||
int v;
|
int v;
|
||||||
|
|
||||||
@@ -120,7 +118,7 @@ mixer_open(const char *name)
|
|||||||
dp->parent_mixer = m;
|
dp->parent_mixer = m;
|
||||||
dp->devno = i;
|
dp->devno = i;
|
||||||
dp->nctl = 0;
|
dp->nctl = 0;
|
||||||
if (MIX_ISDEV(m, i) && _mixer_readvol(dp) < 0)
|
if (MIX_ISDEV(m, i) && mixer_readvol(dp) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
(void)strlcpy(dp->name, names[i], sizeof(dp->name));
|
(void)strlcpy(dp->name, names[i], sizeof(dp->name));
|
||||||
TAILQ_INIT(&dp->ctls);
|
TAILQ_INIT(&dp->ctls);
|
||||||
@@ -334,7 +332,7 @@ mixer_set_vol(struct mixer *m, mix_volume_t vol)
|
|||||||
v = MIX_VOLDENORM(vol.left) | MIX_VOLDENORM(vol.right) << 8;
|
v = MIX_VOLDENORM(vol.left) | MIX_VOLDENORM(vol.right) << 8;
|
||||||
if (ioctl(m->fd, MIXER_WRITE(m->dev->devno), &v) < 0)
|
if (ioctl(m->fd, MIXER_WRITE(m->dev->devno), &v) < 0)
|
||||||
return (-1);
|
return (-1);
|
||||||
if (_mixer_readvol(m->dev) < 0)
|
if (mixer_readvol(m->dev) < 0)
|
||||||
return (-1);
|
return (-1);
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
|
|||||||
Reference in New Issue
Block a user