Commit 82738b30 authored by Josh Coalson's avatar Josh Coalson
Browse files

fixes related to the change of FLAC__VERSION_STRING from a #define to an identifier

parent 7dfd40de
......@@ -120,22 +120,19 @@ extern "C" {
/** The maximum Rice partition order permitted by the format. */
#define FLAC__MAX_RICE_PARTITION_ORDER (15u)
/* VERSION should come from configure */
#ifdef VERSION
/** The version string of the current library.
/** The version string of the release, stamped onto the libraries and binaries.
*
* \note
* This does not correspond to the shared library version number, which
* is used to determine binary compatibility.
*/
#define FLAC__VERSION_STRING VERSION
#endif
extern const char *FLAC__VERSION_STRING;
/** The vendor string inserted by the encoder into the VORBIS_COMMENT block.
* This is a nulL-terminated ASCII string; when inserted into the
* VORBIS_COMMENT the trailing null is stripped.
*/
extern const FLAC__byte *FLAC__VENDOR_STRING;
extern const char *FLAC__VENDOR_STRING;
/** The byte string representation of the beginning of a FLAC stream. */
extern const FLAC__byte FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */
......
......@@ -28,11 +28,14 @@
#endif
#define min(a,b) ((a)<(b)?(a):(b))
/* VERSION should come from configure */
const char *FLAC__VERSION_STRING = VERSION;
#if defined _MSC_VER || defined __MINW32__
/* yet one more hack because of MSVC6: */
const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC 1.0.4_beta 20020910";
const char *FLAC__VENDOR_STRING = "reference libFLAC 1.0.4 20020924";
#else
const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC " FLAC__VERSION_STRING " 20020910";
const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20020924";
#endif
const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
......
......@@ -120,7 +120,7 @@ void config(HWND hwndParent)
}
void about(HWND hwndParent)
{
MessageBox(hwndParent, "Winamp FLAC Plugin v" FLAC__VERSION_STRING ", by Josh Coalson\nSee http://flac.sourceforge.net/", "About FLAC Plugin", MB_OK);
MessageBox(hwndParent, "Winamp FLAC Plugin v" VERSION ", by Josh Coalson\nSee http://flac.sourceforge.net/", "About FLAC Plugin", MB_OK);
}
void init()
......@@ -203,6 +203,7 @@ void unpause()
paused_ = 0;
mod_.outMod->Pause(0);
}
int ispaused()
{
return paused_;
......@@ -357,7 +358,7 @@ DWORD WINAPI __stdcall DecodeThread(void *b)
In_Module mod_ =
{
IN_VER,
"Reference FLAC Player v" FLAC__VERSION_STRING,
"Reference FLAC Player v" VERSION,
0, /* hMainWindow */
0, /* hDllInstance */
"FLAC\0FLAC Audio File (*.FLAC)\0"
......
......@@ -80,7 +80,7 @@ InputPlugin flac_ip =
{
NULL,
NULL,
"Reference FLAC Player v" FLAC__VERSION_STRING,
"Reference FLAC Player v" VERSION,
FLAC_XMMS__init,
FLAC_XMMS__aboutbox,
FLAC_XMMS__configure,
......
Supports Markdown
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