Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba2c46c90d8150bc36d9f88ff0f872043274be04
commit ba2c46c90d8150bc36d9f88ff0f872043274be04
Author: Priyank [EMAIL PROTECTED]
Date: Thu Sep 27 00:28:47 2007 +0530
wxmusik-0.4.2.2-4-i686
* Rebuild against new flac, libmpcdec (Closes #2448)
* Fdesktop-Fdesktop2
* Added three new patches to fix player controls
* Added a patch to fix compilation with flac-1.2
diff --git a/source/xmultimedia-extra/wxmusik/FLAC13.diff
b/source/xmultimedia-extra/wxmusik/FLAC13.diff
new file mode 100644
index 000..3661709
--- /dev/null
+++ b/source/xmultimedia-extra/wxmusik/FLAC13.diff
@@ -0,0 +1,234 @@
+--- wxMusik-0.4.2.2/MUSIKEngine/MUSIKEngine/src/flacdecoder.h 2005-11-21
20:43:47.0 +0100
wxMusik-0.4.2.2.new/MUSIKEngine/MUSIKEngine/src/flacdecoder.h
2007-04-11 16:31:44.0 +0200
+@@ -27,7 +27,7 @@
+ #define FLACDECODER_H
+
+ #include FLAC/format.h
+-#include FLAC/file_decoder.h
++#include FLAC/stream_decoder.h
+ #include plugin_common/defs.h
+ extern C
+ {
+@@ -62,7 +62,7 @@ class MUSIKFLACDecoder :public MUSIKDeco
+ } output_config_t;
+ struct FLACStreamInfo
+ {
+- FLAC__FileDecoder
*Decoder;
++ FLAC__StreamDecoder
*Decoder;
+ FLAC__StreamMetadata_StreamInfo streaminfo; /*
FLAC: metadata infos */
+ FLAC__uint64
pos_sample; /* FLAC: position is sample */
+ bool
flac_abort; /* FLAC: abort flac when an error occured */
+@@ -117,24 +117,24 @@ protected:
+ int DecodeBlocks(unsigned char *buff,int len);
+ bool DoSeek(int nTimeMS);
+
+- static FLAC__StreamDecoderWriteStatus FLACWriteCallback(const
FLAC__FileDecoder *decoder,
++ static FLAC__StreamDecoderWriteStatus FLACWriteCallback(const
FLAC__StreamDecoder *decoder,
+ const FLAC__Frame *frame,
+ const FLAC__int32 * const buffer[], void *client_data);
+- static void FLACMetaCallback(const FLAC__FileDecoder *decoder, const
FLAC__StreamMetadata *metadata, void *client_data);
+- static void FLACErrorCallback(const FLAC__FileDecoder *decoder,
FLAC__StreamDecoderErrorStatus status, void *client_data);
++ static void FLACMetaCallback(const FLAC__StreamDecoder *decoder, const
FLAC__StreamMetadata *metadata, void *client_data);
++ static void FLACErrorCallback(const FLAC__StreamDecoder *decoder,
FLAC__StreamDecoderErrorStatus status, void *client_data);
+
+ private:
+ void safe_decoder_finish_()
+ {
+- if(m_FlacInfo.Decoder
FLAC__file_decoder_get_state(m_FlacInfo.Decoder) !=
FLAC__FILE_DECODER_UNINITIALIZED)
+- FLAC__file_decoder_finish(m_FlacInfo.Decoder );
++ if(m_FlacInfo.Decoder
FLAC__stream_decoder_get_state(m_FlacInfo.Decoder) !=
FLAC__STREAM_DECODER_UNINITIALIZED)
++ FLAC__stream_decoder_finish(m_FlacInfo.Decoder );
+ }
+
+ void safe_decoder_delete_()
+ {
+ if(m_FlacInfo.Decoder ) {
+ safe_decoder_finish_();
+- FLAC__file_decoder_delete(m_FlacInfo.Decoder );
++ FLAC__stream_decoder_delete(m_FlacInfo.Decoder );
+ }
+ m_FlacInfo.Decoder = NULL;
+ }
+--- wxMusik-0.4.2.2/MUSIKEngine/MUSIKEngine/src/flacdecoder.cpp
2005-11-21 20:43:47.0 +0100
wxMusik-0.4.2.2.new/MUSIKEngine/MUSIKEngine/src/flacdecoder.cpp
2007-04-11 16:43:48.0 +0200
+@@ -51,21 +51,21 @@ bool MUSIKFLACDecoder::OpenMedia(const c
+ m_FlacInfo.pos_sample =0;
+ m_FlacInfo.flac_abort = false;
+ m_Info.LengthMS = 0;
+- FLAC__FileDecoder *decoder = FLAC__file_decoder_new();
++
++ FLAC__StreamDecoder *decoder = FLAC__stream_decoder_new();
+ m_FlacInfo.Decoder = decoder;
+- FLAC__file_decoder_set_client_data(decoder,(void *)m_FlacInfo);
+- FLAC__file_decoder_set_md5_checking(decoder, false);
+- FLAC__file_decoder_set_filename(decoder, FileName);
+- FLAC__file_decoder_set_metadata_ignore_all(decoder);
+- FLAC__file_decoder_set_metadata_respond(decoder,
FLAC__METADATA_TYPE_STREAMINFO);
+- FLAC__file_decoder_set_metadata_respond(decoder,
FLAC__METADATA_TYPE_VORBIS_COMMENT);
+- FLAC__file_decoder_set_metadata_callback(decoder, FLACMetaCallback);
+- FLAC__file_decoder_set_write_callback(decoder, FLACWriteCallback);
+- FLAC__file_decoder_set_error_callback(decoder,FLACErrorCallback);
+- FLAC__FileDecoderState nRetVal = FLAC__file_decoder_init(decoder);
+- if (nRetVal == FLAC__FILE_DECODER_OK)
++ FLAC__stream_decoder_set_md5_checking(decoder, false);
++ FLAC__stream_decoder_set_metadata_ignore_all(decoder);
++
