wmix: always display the version information when verbose is asked

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS 2014-06-07 21:21:53 +02:00 committed by Carlos R. Mafra
parent d7add56750
commit 3e2d8a730a

View file

@ -32,8 +32,10 @@
#include "include/config.h" #include "include/config.h"
#define HELP_TEXT \ #define VERSION_TEXT \
"WMixer " VERSION " by timecop@japan.co.jp + skunk@mit.edu\n" \ "WMixer " VERSION " by timecop@japan.co.jp + skunk@mit.edu\n"
#define HELP_TEXT \
"usage:\n" \ "usage:\n" \
" -d <dsp> connect to remote X display\n" \ " -d <dsp> connect to remote X display\n" \
" -e <name> exclude channel, can be used many times\n" \ " -e <name> exclude channel, can be used many times\n" \
@ -151,6 +153,7 @@ void parse_cli_options(int argc, char **argv)
break; break;
case 'h': case 'h':
fputs(VERSION_TEXT, stdout);
fputs(HELP_TEXT, stdout); fputs(HELP_TEXT, stdout);
exit(0); exit(0);
break; break;
@ -178,6 +181,9 @@ void parse_cli_options(int argc, char **argv)
if (error_found) if (error_found)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
if (config.verbose)
fputs(VERSION_TEXT, stdout);
} }
/* /*