Commit 08109972 authored by Ralph Giles's avatar Ralph Giles

Also report vorbis version in the usage for decoder tools.

Follow up on the previous change, propagating the vorbis
library version string to oggdec and ogg123 and regularizing
the output.
parent 3f4ca6e1
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vorbis/vorbisfile.h>
#include <ao/ao.h> #include <ao/ao.h>
#include "getopt.h" #include "getopt.h"
...@@ -304,7 +305,8 @@ void cmdline_usage (void) ...@@ -304,7 +305,8 @@ void cmdline_usage (void)
ao_info **devices = ao_driver_info_list(&driver_count); ao_info **devices = ao_driver_info_list(&driver_count);
printf (_("ogg123 from %s %s\n" printf (_("ogg123 from %s %s\n"
" by the Xiph.Org Foundation (http://www.xiph.org/)\n\n"), PACKAGE, VERSION); " by the Xiph.Org Foundation (https://www.xiph.org/)\n"), PACKAGE, VERSION);
printf (_(" using decoder %s.\n\n"), vorbis_version_string());
printf (_("Usage: ogg123 [options] file ...\n" printf (_("Usage: ogg123 [options] file ...\n"
"Play Ogg audio files and network streams.\n\n")); "Play Ogg audio files and network streams.\n\n"));
......
...@@ -54,7 +54,8 @@ static void version (void) { ...@@ -54,7 +54,8 @@ static void version (void) {
static void usage(void) static void usage(void)
{ {
version (); version ();
fprintf(stdout, _(" by the Xiph.Org Foundation (http://www.xiph.org/)\n\n")); fprintf(stdout, _(" by the Xiph.Org Foundation (https://www.xiph.org/)\n"));
fprintf(stdout, _(" using decoder %s.\n\n"), vorbis_version_string());
fprintf(stdout, _("Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n\n")); fprintf(stdout, _("Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n\n"));
fprintf(stdout, _("Supported options:\n")); fprintf(stdout, _("Supported options:\n"));
fprintf(stdout, _(" --quiet, -Q Quiet mode. No console output.\n")); fprintf(stdout, _(" --quiet, -Q Quiet mode. No console output.\n"));
......
...@@ -500,9 +500,9 @@ clear_all: ...@@ -500,9 +500,9 @@ clear_all:
static void usage(void) static void usage(void)
{ {
fprintf(stdout, _("oggenc from %s %s"), PACKAGE, VERSION); fprintf(stdout, _("oggenc from %s %s\n"), PACKAGE, VERSION);
fprintf(stdout, _(" by the Xiph.Org Foundation (http://www.xiph.org/)\n")); fprintf(stdout, _(" by the Xiph.Org Foundation (https://www.xiph.org/)\n"));
fprintf(stdout, _("Using encoder %s\n\n"), vorbis_version_string()); fprintf(stdout, _(" using encoder %s.\n\n"), vorbis_version_string());
fprintf(stdout, _("Usage: oggenc [options] inputfile [...]\n\n")); fprintf(stdout, _("Usage: oggenc [options] inputfile [...]\n\n"));
fprintf(stdout, _("OPTIONS:\n" fprintf(stdout, _("OPTIONS:\n"
" General:\n" " General:\n"
......
...@@ -1233,7 +1233,7 @@ static void version (void) { ...@@ -1233,7 +1233,7 @@ static void version (void) {
static void usage(void) { static void usage(void) {
version (); version ();
printf (_(" by the Xiph.Org Foundation (http://www.xiph.org/)\n\n")); printf (_(" by the Xiph.Org Foundation (https://www.xiph.org/)\n\n"));
printf(_("(c) 2003-2005 Michael Smith <msmith@xiph.org>\n" printf(_("(c) 2003-2005 Michael Smith <msmith@xiph.org>\n"
"\n" "\n"
"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n" "Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment