r3325 - in packages/trunk/ultrastar-ng/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-11 08:36:13 +0000 (Wed, 11 Jul 2007)
New Revision: 3325

Added:
   packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch
Modified:
   packages/trunk/ultrastar-ng/debian/changelog
   packages/trunk/ultrastar-ng/debian/patches/series
Log:
Added patch to support previewing ogg files with xine (Closes: #430531)



Modified: packages/trunk/ultrastar-ng/debian/changelog
===================================================================
--- packages/trunk/ultrastar-ng/debian/changelog	2007-07-11 08:09:52 UTC (rev 3324)
+++ packages/trunk/ultrastar-ng/debian/changelog	2007-07-11 08:36:13 UTC (rev 3325)
@@ -1,3 +1,9 @@
+ultrastar-ng (0.1.4-2) UNRELEASED; urgency=low
+
+  * Added patch to support previewing ogg files with xine (Closes: #430531)
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 11 Jul 2007 10:34:58 +0200
+
 ultrastar-ng (0.1.4-1) unstable; urgency=low
 
   * Build-Depends on libcairo2-dev (>= 1.2)

Modified: packages/trunk/ultrastar-ng/debian/patches/series
===================================================================
--- packages/trunk/ultrastar-ng/debian/patches/series	2007-07-11 08:09:52 UTC (rev 3324)
+++ packages/trunk/ultrastar-ng/debian/patches/series	2007-07-11 08:36:13 UTC (rev 3325)
@@ -1 +1,2 @@
 exclude_docs.patch
+xine_ogg.patch

Added: packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch
===================================================================
--- packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch	                        (rev 0)
+++ packages/trunk/ultrastar-ng/debian/patches/xine_ogg.patch	2007-07-11 08:36:13 UTC (rev 3325)
@@ -0,0 +1,19 @@
+# xine ogg/vorbis decode that doesn't support seeking if the ogg file hasn't been started.
+# The bug has been confirmed by Darren Salt from xine project.
+#
+# Waiting for xine patch, the following ultrastar-ng patch works
+# http://ultrastar-ng.cvs.sourceforge.net/ultrastar-ng/UltraStar-ng/src/audio.cpp?r1=1.27&r2=1.28
+#
+# See http://bugs.debian.org/430531
+
+--- audio.cpp	2007/06/11 19:25:49	1.27
++++ audio.cpp	2007/07/07 13:59:17	1.28
+@@ -120,7 +120,7 @@
+         int pos_stream;
+ 	int pos_time;
+ 
+-        if (!xine_open(stream, filename) || !xine_play(stream, 0, 30000)) {
++        if (!xine_open(stream, filename) || !xine_play(stream, 0, 0) || !xine_play(stream, 0, 30000)) {
+             printf("could not open %s\n", filename);
+         }
+