diff Plugins/Input/adplug/core/imf.cpp @ 428:15ca2ea93a30 trunk

[svn] Sync with upstream CVS. This implements RIX playback.

--- a/Plugins/Input/adplug/core/imf.cpp	Sat Jan 14 05:40:19 2006 -0800
+++ b/Plugins/Input/adplug/core/imf.cpp	Sat Jan 14 07:27:13 2006 -0800
@@ -1,6 +1,6 @@
 /*
  * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 Simon Peter <[e-mail]>, et al.
+ * Copyright (C) 1999 - 2005 Simon Peter <[e-mail]>, et al.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -90,7 +90,7 @@
       f->seek(-4, binio::Add);
     else
       f->seek(-2, binio::Add);
-    size = flsize / 4;
+    size = (flsize - mfsize) / 4;
   } else		// file has got a footer
     size = fsize / 4;
 
@@ -101,13 +101,20 @@
   }
 
   // read footer, if any
-  if(fsize && (fsize < flsize - 2 - mfsize)) {
-    unsigned long footerlen = flsize - fsize - 2 - mfsize;
+  if(fsize && (fsize < flsize - 2 - mfsize))
+    if(f->readInt(1) == 0x1a) {
+      // Adam Nielsen's footer format
+      track_name = f->readString();
+      author_name = f->readString();
+      remarks = f->readString();
+    } else {
+      // Generic footer
+      unsigned long footerlen = flsize - fsize - 2 - mfsize;
 
-    footer = new char[footerlen + 1];
-    f->readString(footer, footerlen);
-    footer[footerlen] = '\0';	// Make ASCIIZ string
-  }
+      footer = new char[footerlen + 1];
+      f->readString(footer, footerlen);
+      footer[footerlen] = '\0';	// Make ASCIIZ string
+    }
 
   rate = getrate(f);
   fp.close(f);
@@ -152,6 +159,21 @@
   return title;
 }
 
+std::string CimfPlayer::getdesc()
+{
+  std::string	desc;
+
+  if(footer)
+    desc = std::string(footer);
+
+  if(!remarks.empty() && footer)
+    desc += "\n\n";
+
+  desc += remarks;
+
+  return desc;
+}
+
 /*** private methods *************************************/
 
 float CimfPlayer::getrate(binistream *f)