drop major/minor version numbers, use just version string

diff --git a/include/FLAC/format.h b/include/FLAC/format.h
index bd36b9e..fafa553 100644 (file)
--- 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 b4ab40c..1664293 100644 (file)
--- 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 6e08b61..de8d8d6 100644 (file)
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -21,9 +21,6 @@
 #include <stdio.h>
 #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 6dae97c..916a848 100644 (file)
--- 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;
 }