mixer: removed mixer_configure_legacy(), AC_MIXER_CONFIGURE
Those have been superseded by the new legacy configuration code.
This commit is contained in:
parent
188f9e663c
commit
db2058a265
17
src/audio.c
17
src/audio.c
@ -466,20 +466,3 @@ bool mixer_control_getvol(unsigned int device, int *volume)
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool mixer_configure_legacy(char *name, struct config_param *param)
|
|
||||||
{
|
|
||||||
unsigned i;
|
|
||||||
struct audio_output *output;
|
|
||||||
|
|
||||||
for (i = 0; i < audioOutputArraySize; ++i) {
|
|
||||||
output = &audioOutputArray[i];
|
|
||||||
if (output && output->plugin && !strcmp(name, output->plugin->name)) {
|
|
||||||
if (output->plugin->control) {
|
|
||||||
g_debug("reconfiguring %s mixer\n", name);
|
|
||||||
return output->plugin->control(output->data, AC_MIXER_CONFIGURE, param);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
@ -73,6 +73,5 @@ void saveAudioDevicesState(FILE *fp);
|
|||||||
|
|
||||||
bool mixer_control_setvol(unsigned int device, int volume, int rel);
|
bool mixer_control_setvol(unsigned int device, int volume, int rel);
|
||||||
bool mixer_control_getvol(unsigned int device, int *volume);
|
bool mixer_control_getvol(unsigned int device, int *volume);
|
||||||
bool mixer_configure_legacy(char *name, struct config_param *param);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -162,11 +162,6 @@ alsa_mixer_control(struct mixer_data *data, int cmd, void *arg)
|
|||||||
{
|
{
|
||||||
struct alsa_mixer *am = (struct alsa_mixer *)data;
|
struct alsa_mixer *am = (struct alsa_mixer *)data;
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case AC_MIXER_CONFIGURE:
|
|
||||||
alsa_mixer_configure(data, (const struct config_param *)arg);
|
|
||||||
if (am->handle)
|
|
||||||
alsa_mixer_close(data);
|
|
||||||
return true;
|
|
||||||
case AC_MIXER_GETVOL:
|
case AC_MIXER_GETVOL:
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
@ -153,12 +153,6 @@ oss_mixer_control(struct mixer_data *data, int cmd, void *arg)
|
|||||||
{
|
{
|
||||||
struct oss_mixer *om = (struct oss_mixer *) data;
|
struct oss_mixer *om = (struct oss_mixer *) data;
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case AC_MIXER_CONFIGURE:
|
|
||||||
oss_mixer_configure(data, (const struct config_param *)arg);
|
|
||||||
if (om->device_fd >= 0)
|
|
||||||
oss_mixer_close(data);
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case AC_MIXER_GETVOL:
|
case AC_MIXER_GETVOL:
|
||||||
{
|
{
|
||||||
int left, right, level;
|
int left, right, level;
|
||||||
|
@ -127,7 +127,6 @@ enum audio_output_command {
|
|||||||
enum audio_control_command {
|
enum audio_control_command {
|
||||||
AC_MIXER_GETVOL = 0,
|
AC_MIXER_GETVOL = 0,
|
||||||
AC_MIXER_SETVOL,
|
AC_MIXER_SETVOL,
|
||||||
AC_MIXER_CONFIGURE,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct audio_output;
|
struct audio_output;
|
||||||
|
Loading…
Reference in New Issue
Block a user