From e5b2ab2a9fefc180c4d0e4b07b4809aff9fa33a9 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 14 Nov 2007 11:54:38 +0100 Subject: [PATCH] alsactl - Set -F option as default Set -F option as default for restore. There are still too many systems that are too lazy to set -F option... Added the new -P option to back to the old behavior. --- alsactl/alsactl.1 | 7 ++++++- alsactl/alsactl.c | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/alsactl/alsactl.1 b/alsactl/alsactl.1 index b7aa8af..48924c2 100644 --- a/alsactl/alsactl.1 +++ b/alsactl/alsactl.1 @@ -41,7 +41,12 @@ Select the configuration file to use. The default is /etc/asound.state or .TP \fI\-F, \-\-force\fP Used with restore command. Try to restore the matching control elements -as much as possible. +as much as possible. This option is set as default now. + +.TP +\fI\-P, \-\-pedantic\fP +Used with restore command. Don't restore mismatching control elements. +This option was the old default behavior. .TP \fI\-d, \-\-debug\fP diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c index ef47f34..78c6cb1 100644 --- a/alsactl/alsactl.c +++ b/alsactl/alsactl.c @@ -34,7 +34,7 @@ #define SYS_ASOUNDNAMES "/etc/asound.names" int debugflag = 0; -int force_restore = 0; +int force_restore = 1; char *command; static void help(void) @@ -44,6 +44,8 @@ static void help(void) printf(" -h,--help this help\n"); printf(" -f,--file # configuration file (default " SYS_ASOUNDRC " or " SYS_ASOUNDNAMES ")\n"); printf(" -F,--force try to restore the matching controls as much as possible\n"); + printf(" (default mode)\n"); + printf(" -P,--pedantic don't restore mismatching controls (old default)\n"); printf(" -d,--debug debug mode\n"); printf(" -v,--version print version of this program\n"); printf("\nAvailable commands:\n"); @@ -62,6 +64,7 @@ int main(int argc, char *argv[]) {"help", 0, NULL, 'h'}, {"file", 1, NULL, 'f'}, {"force", 0, NULL, 'F'}, + {"pedantic", 0, NULL, 'P'}, {"debug", 0, NULL, 'd'}, {"version", 0, NULL, 'v'}, {NULL, 0, NULL, 0}, @@ -85,6 +88,9 @@ int main(int argc, char *argv[]) case 'F': force_restore = 1; break; + case 'P': + force_restore = 0; + break; case 'd': debugflag = 1; break;