# HG changeset patch
# User chainsaw
# Date 1176481661 25200
# Node ID ae7e96e44f22ed87c9767c13cd98f71f3489e318
# Parent  87666f9bf6d0e2d7b79d1903ebe27f335e890c83
[svn] Now in sync with AdPlug upstream, merging their commit: "Removed superfluous exit() call. This was detected as part of a GCC 4.3
compilation regression test. Thanks to Martin Michlmayr! Fixes Debian bug
#417078."

diff -r 87666f9bf6d0 -r ae7e96e44f22 ChangeLog
--- a/ChangeLog	Fri Apr 13 09:09:50 2007 -0700
+++ b/ChangeLog	Fri Apr 13 09:27:41 2007 -0700
@@ -1,3 +1,21 @@
+2007-04-13 16:09:50 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2038]
+  Upstream commit "Vastly enhanced generic Protracker player and modified loaders accordingly.
+  Copl now supports a getchip() method. A2M loader enhanced for OPL3 features." manually applied by decoding the actual changes from an ocean of whitespace damage. It compiles, but do test it.
+  trunk/src/adplug/core/a2m.cxx      |  200 +++++++++++++++++-------------
+  trunk/src/adplug/core/a2m.h        |    7 -
+  trunk/src/adplug/core/amd.cxx      |    4 
+  trunk/src/adplug/core/fmc.cxx      |    4 
+  trunk/src/adplug/core/opl.h        |    7 -
+  trunk/src/adplug/core/player.cxx   |    2 
+  trunk/src/adplug/core/player.h     |    4 
+  trunk/src/adplug/core/protrack.cxx |  240 ++++++++++++++++++++++++++-----------
+  trunk/src/adplug/core/protrack.h   |  138 +++++++++++----------
+  trunk/src/adplug/core/rad.cxx      |    4 
+  trunk/src/adplug/core/sa2.cxx      |    6 
+  11 files changed, 383 insertions(+), 233 deletions(-)
+
+
 2007-04-13 15:07:32 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2036]
   D00 Vibrato and Slides fix by Dennis Lindroos (from upstream CVS).
diff -r 87666f9bf6d0 -r ae7e96e44f22 src/adplug/core/rix.cxx
--- a/src/adplug/core/rix.cxx	Fri Apr 13 09:09:50 2007 -0700
+++ b/src/adplug/core/rix.cxx	Fri Apr 13 09:27:41 2007 -0700
@@ -1,6 +1,6 @@
 /*
  * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -134,6 +134,7 @@
   set_new_int();
   data_initial();
 }
+
 unsigned int CrixPlayer::getsubsongs()
 {
 	if(flag_mkf)
@@ -157,7 +158,8 @@
 /*------------------Implemention----------------------------*/
 inline void CrixPlayer::set_new_int()
 {
-  if(!ad_initial()) exit(1);
+//   if(!ad_initial()) exit(1);
+  ad_initial();
 }
 /*----------------------------------------------------------*/
 inline void CrixPlayer::Pause()