Author: hawk Date: Wed Feb 14 12:18:58 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix for flac 1.1.3 issues, taken from Gentoo
---- Files affected:
SOURCES:
hydrogen-flac113.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/hydrogen-flac113.patch
diff -u /dev/null SOURCES/hydrogen-flac113.patch:1.1
--- /dev/null Wed Feb 14 13:18:58 2007
+++ SOURCES/hydrogen-flac113.patch Wed Feb 14 13:18:53 2007
@@ -0,0 +1,45 @@
+--- src/lib/FLACFile.cpp.old 2007-02-11 20:12:34.000000000 +0100
++++ src/lib/FLACFile.cpp 2007-02-11 20:18:25.000000000 +0100
+@@ -33,6 +33,13 @@
+ //#include "FLAC/file_decoder.h"
+ #include <FLAC++/all.h>
+
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
++
+ /// Reads a FLAC file...not optimized yet
+ class FLACFile_real : public FLAC::Decoder::File, public Object
+ {
+@@ -164,16 +171,28 @@
+ }
+
+ set_metadata_ignore_all();
++
++#ifdef LEGACY_FLAC
+ set_filename( sFilename.c_str() );
+
+ State s=init();
+ if( s != FLAC__FILE_DECODER_OK ) {
++#else
++ FLAC__StreamDecoderInitStatus s=init(sFilename.c_str() );
++ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++#endif
+ errorLog( "[load] Error in init()" );
+ }
+
++#ifdef LEGACY_FLAC
+ if ( process_until_end_of_file() == false ) {
+ errorLog( "[load] Error in process_until_end_of_file()" );
+ }
++#else
++ if ( process_until_end_of_stream() == false ) {
++ errorLog( "[load] Error in process_until_end_of_stream()" );
++ }
++#endif
+ }
+
+
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
