Author: toots
Date: Fri Mar 21 10:56:30 2008
New Revision: 5344
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5344
Log:
Prepared new package
Modified:
trunk/packages/liquidsoap/trunk/debian/changelog
trunk/packages/liquidsoap/trunk/debian/control
trunk/packages/liquidsoap/trunk/debian/patches/fix_smart_crossfade.patch
Modified: trunk/packages/liquidsoap/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/changelog?rev=5344&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/changelog (original)
+++ trunk/packages/liquidsoap/trunk/debian/changelog Fri Mar 21 10:56:30 2008
@@ -1,3 +1,11 @@
+liquidsoap (0.3.6-4) unstable; urgency=high
+
+ * Updated fix for smartcross
+ * Still setting urgency to high since testing package is
+ still broken..
+
+ -- Romain Beauxis <[EMAIL PROTECTED]> Tue, 04 Mar 2008 03:42:50 +0100
+
liquidsoap (0.3.6-3) unstable; urgency=high
* Backported patch to fix smart_crossfading
Modified: trunk/packages/liquidsoap/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control?rev=5344&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control (original)
+++ trunk/packages/liquidsoap/trunk/debian/control Fri Mar 21 10:56:30 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <[EMAIL PROTECTED]>
Uploaders: Romain Beauxis <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>=
0.4.27-1), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>=
0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2),
libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev,
festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python,
python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2),
libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev,
libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>=
0.4.27), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>=
0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2),
libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev,
festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python,
python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2),
libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev,
libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.3
Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Modified:
trunk/packages/liquidsoap/trunk/debian/patches/fix_smart_crossfade.patch
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_smart_crossfade.patch?rev=5344&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_smart_crossfade.patch
(original)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_smart_crossfade.patch
Fri Mar 21 10:56:30 2008
@@ -2,12 +2,19 @@
===================================================================
--- liquidsoap-0.3.6.orig/src/operators/smartcross.ml (révision 5078)
+++ liquidsoap-0.3.6/src/operators/smartcross.ml (révision 5079)
-@@ -117,7 +117,7 @@
+@@ -117,9 +117,13 @@
| `Limit ->
(* The track finished.
* We compute rms_after and launch the transition. *)
- self#analyze_after ;
+ if source#is_ready then self#analyze_after ;
self#create_transition ;
- self#get_frame ab
+- self#get_frame ab
++ (* Check if the new source is ready *)
++ if source#is_ready then
++ self#get_frame ab
++ else
++ Frame.add_break ab (Frame.position ab)
| `After size ->
+ (* The work is done, we are now playing the transition.
+ * We have to keep playing it without checking for a new track limit
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
