Make gengetopt descriptions work.

[paraslash.git] / play.c

diff --git a/play.c b/play.c
index 814ec16a5288cd7ba4be5c0bbea275a9fc812ef6..7c1ee93259ce6bd800daed3600ce7aae3400ffd9 100644 (file)
--- a/play.c
+++ b/play.c
@@ -137,28 +137,16 @@ static void check_afh_receiver_or_die(void)
        exit(EXIT_FAILURE);
 }
 
-/** Description to be included in the --detailed-help output. */
-#define PP_DESC \
-"para_play is a command line audio player.\n" \
-"\n" \
-"It operates either in command mode or in insert mode. In insert mode it\n" \
-"presents a prompt and allows to enter para_play commands like stop, play, pause\n" \
-"etc. In command mode, the current audio file is shown and the program reads\n" \
-"single key strokes from stdin. Keys may be mapped to para_play commands.\n" \
-"Whenever a mapped key is pressed, the associated command is executed.\n" \
-
 __noreturn static void print_help_and_die(void)
 {
        int d = conf.detailed_help_given;
        const char **p = d? play_args_info_detailed_help
                : play_args_info_help;
 
-//     printf_or_die("%s\n\n", PLAY_CMDLINE_PARSER_PACKAGE "-"
-//             PLAY_CMDLINE_PARSER_VERSION);
-
+       printf_or_die("%s\n\n", version_single_line("play"));
        printf_or_die("%s\n\n", play_args_info_usage);
        if (d)
-               printf_or_die("%s\n", PP_DESC);
+               printf_or_die("%s\n", play_args_info_description);
        for (; *p; p++)
                printf_or_die("%s\n", *p);
        exit(0);
@@ -177,8 +165,8 @@ static void parse_config_or_die(int argc, char *argv[])
        };
 
        play_cmdline_parser_ext(argc, argv, &conf, &params);
-       HANDLE_VERSION_FLAG("play", conf);
        loglevel = get_loglevel_by_name(conf.loglevel_arg);
+       version_handle_flag("play", conf.version_given);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
        if (conf.config_file_given)
@@ -1044,7 +1032,7 @@ static void session_open(__a_unused struct play_task *pt)
        char *history_file;
        struct sigaction act;
 
-       PARA_NOTICE_LOG("\n%s\n", VERSION_TEXT("play"));
+       PARA_NOTICE_LOG("\n%s\n", version_text("play"));
        if (conf.history_file_given)
                history_file = para_strdup(conf.history_file_arg);
        else {