diff Plugins/Input/adplug/core/rix.h @ 1280:6ad7eb96dd26 trunk

[svn] Sync with upstream. This adds Westwood ADL format support.

--- a/Plugins/Input/adplug/core/rix.h	Fri Jun 16 20:55:52 2006 -0700
+++ b/Plugins/Input/adplug/core/rix.h	Sat Jun 17 16:17:51 2006 -0700
@@ -28,7 +28,7 @@
   static CPlayer *factory(Copl *newopl);
 
   CrixPlayer(Copl *newopl);
-  ~CrixPlayer() {};
+  ~CrixPlayer();
 
   bool load(const std::string &filename, const CFileProvider &fp);
   bool update();
@@ -57,7 +57,7 @@
   unsigned char bd_modify;
   int sustain;
   int dro_end;
-  unsigned char buf_addr[327680];  /* rix files' buffer */
+  unsigned char *buf_addr;  /* rix files' buffer */
   unsigned short buffer[300];
   unsigned short a0b0_data2[11];
   unsigned char a0b0_data3[18];
@@ -68,12 +68,8 @@
   unsigned short displace[11];
   ADDT reg_bufs[18];
   unsigned long pos,length;
-  unsigned long msdone,mstotal;
+  unsigned char index;
   unsigned short delay;
-  unsigned char index, opl3_mode;
-  enum OplMode {
-    ModeOPL2,ModeOPL3,ModeDUALOPL2
-  } mode;
 
   static const unsigned char adflag[18];
   static const unsigned char reg_data[18];