diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2005-06-06 14:02:10 +0000 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2005-06-06 14:02:10 +0000 |
| commit | 734cb04e08b696b8fa38e9ac224b0fde150e4e42 (patch) | |
| tree | 0b194d887ed71f7847c78118b735bf44f3265b0c /amixer | |
| parent | 3121251d82bc262e7d81bf137165e8a38e20e044 (diff) | |
| download | alsa-utils-734cb04e08b696b8fa38e9ac224b0fde150e4e42.tar.gz | |
Set the device name for smixer_options
Diffstat (limited to 'amixer')
| -rw-r--r-- | amixer/amixer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/amixer/amixer.c b/amixer/amixer.c index e314aa2..fec8824 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -121,7 +121,7 @@ static int info(void) error("Mixer open error: %s", snd_strerror(err)); return err; } - if ((err = snd_mixer_attach(mhandle, card)) < 0) { + if (smixer_level == 0 && (err = snd_mixer_attach(mhandle, card)) < 0) { error("Mixer attach %s error: %s", card, snd_strerror(err)); snd_mixer_close(mhandle); return err; @@ -771,7 +771,7 @@ static int selems(int level) error("Mixer %s open error: %s", card, snd_strerror(err)); return err; } - if ((err = snd_mixer_attach(handle, card)) < 0) { + if (smixer_level == 0 && (err = snd_mixer_attach(handle, card)) < 0) { error("Mixer attach %s error: %s", card, snd_strerror(err)); snd_mixer_close(handle); return err; @@ -1142,7 +1142,7 @@ static int sset(unsigned int argc, char *argv[], int roflag) error("Mixer %s open error: %s\n", card, snd_strerror(err)); return err; } - if ((err = snd_mixer_attach(handle, card)) < 0) { + if (smixer_level == 0 && (err = snd_mixer_attach(handle, card)) < 0) { error("Mixer attach %s error: %s", card, snd_strerror(err)); snd_mixer_close(handle); return err; @@ -1424,7 +1424,7 @@ static int sevents(int argc ATTRIBUTE_UNUSED, char *argv[] ATTRIBUTE_UNUSED) error("Mixer %s open error: %s", card, snd_strerror(err)); return err; } - if ((err = snd_mixer_attach(handle, card)) < 0) { + if (smixer_level == 0 && (err = snd_mixer_attach(handle, card)) < 0) { error("Mixer attach %s error: %s", card, snd_strerror(err)); snd_mixer_close(handle); return err; @@ -1545,6 +1545,7 @@ int main(int argc, char *argv[]) help(); return 1; } + smixer_options.device = card; if (argc - optind <= 0) { return selems(LEVEL_BASIC | level) ? 1 : 0; } |