# HG changeset patch
# User chainsaw
# Date 1179790362 25200
# Node ID 0f2f68b9c98c9da0dab19ebfed8b494b64279774
# Parent  10fc7b5378f0dc2d1f6b35ae73667223af5f17a0
[svn] dnl CD-Audio New Generation; you need to add cdaudio-ng to INPUT_PLUGINS if CDIO_LIBS is set. Or something like that. Good luck.

diff -r 10fc7b5378f0 -r 0f2f68b9c98c ChangeLog
--- a/ChangeLog	Mon May 21 16:18:14 2007 -0700
+++ b/ChangeLog	Mon May 21 16:32:42 2007 -0700
@@ -1,3 +1,10 @@
+2007-05-21 23:18:14 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2266]
+  .so != .c and lack of sleep is not an excuse.
+  trunk/src/cdaudio-ng/Makefile |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-05-21 23:08:45 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2264]
   This Makefile upsets it less. Needs LIBCDIO detection in configure.ac though.
diff -r 10fc7b5378f0 -r 0f2f68b9c98c configure.ac
--- a/configure.ac	Mon May 21 16:18:14 2007 -0700
+++ b/configure.ac	Mon May 21 16:32:42 2007 -0700
@@ -1053,6 +1053,8 @@
     esac
 fi
 
+dnl CD-Audio New Generation
+PKG_CHECK_MODULES(CDIO, [libcdio >= 0.78.2])
 
 AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes")
 AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")
diff -r 10fc7b5378f0 -r 0f2f68b9c98c src/modplug/modplug.cxx
--- a/src/modplug/modplug.cxx	Mon May 21 16:18:14 2007 -0700
+++ b/src/modplug/modplug.cxx	Mon May 21 16:32:42 2007 -0700
@@ -251,8 +251,8 @@
 	int maxtime = file->mSoundFile.GetSongTime() * 1000;
 	float postime;
 
-	if(millisecond > maxtime)
-		millisecond = maxtime;
+	if(millisecond >= maxtime)
+		millisecond = maxtime - 3000;
 	maxpos = file->mSoundFile.GetMaxPosition();
 	postime = (float)maxpos / (float)maxtime;