diff options
Diffstat (limited to 'kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch')
-rw-r--r-- | kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch deleted file mode 100644 index 98df4cf0..00000000 --- a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-4.0.0-flac-1.1.3.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp -=================================================================== ---- kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 749997) -+++ kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (working copy) -@@ -48,7 +48,16 @@ public: - unsigned long data; - }; - --static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) -+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, -+ const FLAC__byte buffer[], -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 -+ unsigned bytes, -+#else -+ size_t bytes, -+#endif -+ unsigned samples, -+ unsigned current_frame, -+ void *client_data) - { - EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; - -@@ -110,9 +119,11 @@ unsigned long EncoderFLAC::size(long tim - long EncoderFLAC::readInit(long size) { - kDebug(7117) << "EncoderFLAC::readInit() called"; - d->data = 0; -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 - FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback); - FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback); - FLAC__stream_encoder_set_client_data(d->encoder, d); -+#endif - - // The options match approximely those of flac compression-level-3 - FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true); -@@ -125,7 +136,11 @@ long EncoderFLAC::readInit(long size) { - if (size > 0) - FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4); - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 - FLAC__stream_encoder_init(d->encoder); -+#else -+ FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d); -+#endif - return d->data; - } - |