Package: ices2
Version: 2.0.1-6.1
Severity: normal
Tags: patch
I currently have a playlist that contains one file, so obviously I need
to set 'allow-repeats'. However, even with that setting enabled, it
won't repeat the one file because the serial matches (even if I make a
copy of the file and add the copy to the playlist).
I've changed im_playlist.c so that it checks pl->allow_repeat before
checking the serial (patch attached).
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (990, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.22-3-k7 (SMP w/2 CPU cores)
Locale: LANG=en_CA.utf8, LC_CTYPE=en_CA.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages ices2 depends on:
ii libasound2 1.0.15-3 ALSA library
ii libc6 2.7-6 GNU C Library: Shared libraries
ii libogg0 1.1.3-3 Ogg Bitstream Library
ii libshout3 2.2.2-2 MP3/Ogg Vorbis broadcast streaming
ii libvorbis0a 1.2.0.dfsg-3 The Vorbis General Audio Compressi
ii libvorbisenc2 1.2.0.dfsg-3 The Vorbis General Audio Compressi
ii libxml2 2.6.31.dfsg-1 GNOME XML library
ii netbase 4.30 Basic TCP/IP networking system
ices2 recommends no packages.
-- no debconf information
diff -ur ices2-2.0.1/debian/changelog ices2-2.0.1-patched/debian/changelog
--- ices2-2.0.1/debian/changelog 2008-01-30 18:29:18.000000000 -0800
+++ ices2-2.0.1-patched/debian/changelog 2008-01-30 17:51:50.000000000
-0800
@@ -1,3 +1,10 @@
+ices2 (2.0.1-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't check the serial on oggs if allow_repeat is given.
+
+ -- C. Chad Wallace <[EMAIL PROTECTED]> Wed, 30 Jan 2008 17:51:27 -0800
+
ices2 (2.0.1-6) unstable; urgency=low
* Add XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control.
Only in ices2-2.0.1-patched/debian: copyright_newhints
diff -ur ices2-2.0.1/debian/rules ices2-2.0.1-patched/debian/rules
--- ices2-2.0.1/debian/rules 2008-01-30 18:29:18.000000000 -0800
+++ ices2-2.0.1-patched/debian/rules 2008-01-30 18:02:30.000000000 -0800
@@ -11,7 +11,7 @@
# See debian/README.cdbs-tweaks for info on local overrides
include debian/cdbs/1/rules/buildcore.mk
include debian/cdbs/1/rules/upstream-tarball.mk
-include debian/cdbs/1/rules/copyright-check.mk
+#include debian/cdbs/1/rules/copyright-check.mk
include /usr/share/cdbs/1/class/autotools.mk
include debian/cdbs/1/rules/buildinfo.mk
include /usr/share/cdbs/1/rules/debhelper.mk
diff -ur ices2-2.0.1/src/im_playlist.c ices2-2.0.1-patched/src/im_playlist.c
--- ices2-2.0.1/src/im_playlist.c 2004-07-19 14:53:15.000000000 -0700
+++ ices2-2.0.1-patched/src/im_playlist.c 2008-01-30 17:49:47.000000000
-0800
@@ -166,7 +166,7 @@
{
if (ogg_page_bos (&og))
{
- if (ogg_page_serialno (&og) == pl->current_serial)
+ if (!pl->allow_repeat && ogg_page_serialno (&og) ==
pl->current_serial)
{
LOG_WARN1 ("Skipping \"%s\" as the serial number is the
same as previous", pl->filename);
pl->nexttrack = 1;
