From e6898a37f867bd771fea005560c919c29a1e1492 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 24 Jan 2001 19:01:07 +0000 Subject: [PATCH] drop major/minor version numbers, use just version string --- include/FLAC/format.h | 2 -- src/flac/main.c | 4 ++-- src/libFLAC/format.c | 3 --- src/plugin_xmms/plugin.c | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/FLAC/format.h b/include/FLAC/format.h index bd36b9ee..fafa5530 100644 --- a/include/FLAC/format.h +++ b/include/FLAC/format.h @@ -38,8 +38,6 @@ /* VERSION comes from configure */ #define FLAC__VERSION_STRING VERSION -extern const unsigned FLAC__MAJOR_VERSION; -extern const unsigned FLAC__MINOR_VERSION; extern const byte FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */; extern const unsigned FLAC__STREAM_SYNC; /* = 0x664C6143 */; diff --git a/src/flac/main.c b/src/flac/main.c index b4ab40c5..16642932 100644 --- a/src/flac/main.c +++ b/src/flac/main.c @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) if(verbose) { printf("\n"); - printf("flac v%u.%u, Copyright (C) 2000,2001 Josh Coalson\n", FLAC__MAJOR_VERSION, FLAC__MINOR_VERSION); + printf("flac %s, Copyright (C) 2000,2001 Josh Coalson\n", FLAC__VERSION_STRING); printf("flac comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"); printf("welcome to redistribute it under certain conditions. Type `flac' for details.\n\n"); @@ -298,7 +298,7 @@ int usage(const char *message, ...) } printf("==============================================================================\n"); - printf("flac - Command-line FLAC encoder/decoder version %u.%u\n", FLAC__MAJOR_VERSION, FLAC__MINOR_VERSION); + printf("flac - Command-line FLAC encoder/decoder version %s\n", FLAC__VERSION_STRING); printf("Copyright (C) 2000,2001 Josh Coalson\n"); printf("\n"); printf("This program is free software; you can redistribute it and/or\n"); diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index 6e08b61d..de8d8d65 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -21,9 +21,6 @@ #include #include "FLAC/format.h" -const unsigned FLAC__MAJOR_VERSION = 0; -const unsigned FLAC__MINOR_VERSION = 5; - const byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; const unsigned FLAC__STREAM_SYNC = 0x664C6143; const unsigned FLAC__STREAM_SYNC_LEN = 32; /* bits */; diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c index 6dae97c6..916a848b 100644 --- a/src/plugin_xmms/plugin.c +++ b/src/plugin_xmms/plugin.c @@ -106,7 +106,7 @@ static bool audio_error_ = false; InputPlugin *get_iplugin_info() { - flac_ip.description = g_strdup_printf("FLAC Player v%u.%u", FLAC__MAJOR_VERSION, FLAC__MINOR_VERSION); + flac_ip.description = g_strdup_printf("FLAC Player v%s", FLAC__VERSION_STRING); return &flac_ip; }