Author: hawk Date: Tue Mar 13 16:39:19 2007 GMT Module: SOURCES Tag: AC-branch ---- Log message: - patch to compile against flac 1.1.3, taken from Mandriva, includes x8664 fix
---- Files affected: SOURCES: muine-flac.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/muine-flac.patch diff -u /dev/null SOURCES/muine-flac.patch:1.1.2.1 --- /dev/null Tue Mar 13 17:39:19 2007 +++ SOURCES/muine-flac.patch Tue Mar 13 17:39:14 2007 @@ -0,0 +1,65 @@ +--- muine-0.8.7/libmuine/metadata.c.flac 2007-01-19 23:14:07.000000000 +0100 ++++ muine-0.8.7/libmuine/metadata.c 2007-01-22 13:52:05.000000000 +0100 +@@ -41,6 +41,12 @@ + #include "metadata.h" + #include "macros.h" + ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ + struct _Metadata { + char *title; + +@@ -747,7 +747,7 @@ + } CallbackData; + + static FLAC__StreamDecoderReadStatus +-FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), FLAC__byte buffer[], unsigned *bytes, void *client_data) ++FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), FLAC__byte buffer[], size_t *bytes, void *client_data) + { + CallbackData *data = (CallbackData *) client_data; + GnomeVFSFileSize read; +@@ -829,22 +835,40 @@ + + flac_decoder = FLAC__stream_decoder_new (); + ++#if defined(LEGACY_FLAC) + FLAC__stream_decoder_set_read_callback (flac_decoder, FLAC_read_callback); + FLAC__stream_decoder_set_write_callback (flac_decoder, FLAC_write_callback); + FLAC__stream_decoder_set_metadata_callback (flac_decoder, FLAC_metadata_callback); + FLAC__stream_decoder_set_error_callback (flac_decoder, FLAC_error_callback); ++#endif + + callback_data = g_new0 (CallbackData, 1); + callback_data->handle = handle; + callback_data->comment = comment; ++#if defined(LEGACY_FLAC) + FLAC__stream_decoder_set_client_data (flac_decoder, callback_data); ++#endif + + /* by default, only the STREAMINFO block is parsed and passed to + * the metadata callback. Here we instruct the decoder to also + * pass us the VORBISCOMMENT block if there is one. */ + FLAC__stream_decoder_set_metadata_respond (flac_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); + ++#if defined(LEGACY_FLAC) + FLAC__stream_decoder_init (flac_decoder); ++#else ++ FLAC__stream_decoder_init_stream (flac_decoder, ++ FLAC_read_callback, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ FLAC_write_callback, ++ FLAC_metadata_callback, ++ FLAC_error_callback, ++ callback_data ++ ); ++#endif + + /* this runs the decoding process, calling the callbacks as appropriate */ + if (FLAC__stream_decoder_process_until_end_of_metadata (flac_decoder) == 0) { ================================================================ _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit