rev 4871 - in trunk/packages/akode/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-11-09 18:16:08 +0100 (Thu, 09 Nov 2006)
New Revision: 4871

Added:
   trunk/packages/akode/debian/patches/12_oggflac_decoding.diff
Modified:
   trunk/packages/akode/debian/changelog
Log:
add a 2nd patch for oggflac

Modified: trunk/packages/akode/debian/changelog
===================================================================
--- trunk/packages/akode/debian/changelog	2006-11-09 15:59:33 UTC (rev 4870)
+++ trunk/packages/akode/debian/changelog	2006-11-09 17:16:08 UTC (rev 4871)
@@ -1,7 +1,8 @@
 akode (2.0.1-2) UNRELEASED; urgency=low
 
-  * Add patch to support flac 1.1.3. libOggFLAC was merged into libFLAC.
-    Thanks to Josh Coalson.
+  * Add 2 patches (thanks to Josh Coalson):
+    * flac 1.1.3 support. libOggFLAC was merged into libFLAC.
+    * prevent a possible problem with Ogg FLAC decoding at end of stream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed,  1 Nov 2006 21:03:26 +0100
 

Added: trunk/packages/akode/debian/patches/12_oggflac_decoding.diff
===================================================================
--- trunk/packages/akode/debian/patches/12_oggflac_decoding.diff	2006-11-09 15:59:33 UTC (rev 4870)
+++ trunk/packages/akode/debian/patches/12_oggflac_decoding.diff	2006-11-09 17:16:08 UTC (rev 4871)
@@ -0,0 +1,22 @@
+diff -ru akode-2.0.1-b2/akode/plugins/xiph_decoder/flac_decoder.cpp akode-2.0.1-b2-2nd/akode/plugins/xiph_decoder/flac_decoder.cpp
+--- akode-2.0.1-b2/akode/plugins/xiph_decoder/flac_decoder.cpp	2006-10-26 20:12:00.000000000 -0700
++++ akode-2.0.1-b2-2nd/akode/plugins/xiph_decoder/flac_decoder.cpp	2006-11-03 21:02:51.000000000 -0800
+@@ -155,11 +155,16 @@
+ 
+     long res = data->source->read((char*)buffer, *bytes);
+     if (res<=0) {
+-        if (data->source->eof()) data->eof = true;
+ #ifdef LEGACY_FLAC
++        if (data->source->eof()) data->eof = true;
+         return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
+ #else
+-        return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
++        if (data->source->eof()) {
++            data->eof = true;
++            return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
++        }
++        else
++            return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+ #endif
+     }
+     else {