diff src/adplug/core/dfm.cxx @ 955:4709ce4e209e trunk

[svn] Run indent -ts4 -nut -bli0 -cdw on this messy lot. Upstream is not consistent with whitespace anyway, no loss there.

--- a/src/adplug/core/dfm.cxx	Sat Apr 14 08:48:41 2007 -0700
+++ b/src/adplug/core/dfm.cxx	Sat Apr 14 15:23:50 2007 -0700
@@ -25,91 +25,113 @@
 #include "dfm.h"
 #include "debug.h"
 
-CPlayer *CdfmLoader::factory(Copl *newopl)
+CPlayer *
+CdfmLoader::factory (Copl * newopl)
 {
-  return new CdfmLoader(newopl);
+  return new CdfmLoader (newopl);
 }
 
-bool CdfmLoader::load(VFSFile *fd, const CFileProvider &fp)
+bool
+CdfmLoader::load (VFSFile * fd, const CFileProvider & fp)
 {
-  binistream *f = fp.open(fd); if(!f) return false;
-  unsigned char		npats,n,note,fx,c,r,param;
-  unsigned int		i;
-  const unsigned char	convfx[8] = {255,255,17,19,23,24,255,13};
+  binistream *f = fp.open (fd);
+  if (!f)
+    return false;
+  unsigned char npats, n, note, fx, c, r, param;
+  unsigned int i;
+  const unsigned char convfx[8] = { 255, 255, 17, 19, 23, 24, 255, 13 };
 
   // file validation
-  f->readString(header.id, 4);
-  header.hiver = f->readInt(1); header.lover = f->readInt(1);
-  if(strncmp(header.id,"DFM\x1a",4) || header.hiver > 1)
-    { fp.close(f); return false; }
+  f->readString (header.id, 4);
+  header.hiver = f->readInt (1);
+  header.lover = f->readInt (1);
+  if (strncmp (header.id, "DFM\x1a", 4) || header.hiver > 1)
+  {
+    fp.close (f);
+    return false;
+  }
 
   // load
-  restartpos = 0; flags = Standard; bpm = 0;
-  init_trackord();
-  f->readString(songinfo, 33);
-  initspeed = f->readInt(1);
-  for(i = 0; i < 32; i++)
-    f->readString(instname[i], 12);
-  for(i = 0; i < 32; i++) {
-    inst[i].data[1] = f->readInt(1);
-    inst[i].data[2] = f->readInt(1);
-    inst[i].data[9] = f->readInt(1);
-    inst[i].data[10] = f->readInt(1);
-    inst[i].data[3] = f->readInt(1);
-    inst[i].data[4] = f->readInt(1);
-    inst[i].data[5] = f->readInt(1);
-    inst[i].data[6] = f->readInt(1);
-    inst[i].data[7] = f->readInt(1);
-    inst[i].data[8] = f->readInt(1);
-    inst[i].data[0] = f->readInt(1);
+  restartpos = 0;
+  flags = Standard;
+  bpm = 0;
+  init_trackord ();
+  f->readString (songinfo, 33);
+  initspeed = f->readInt (1);
+  for (i = 0; i < 32; i++)
+    f->readString (instname[i], 12);
+  for (i = 0; i < 32; i++)
+  {
+    inst[i].data[1] = f->readInt (1);
+    inst[i].data[2] = f->readInt (1);
+    inst[i].data[9] = f->readInt (1);
+    inst[i].data[10] = f->readInt (1);
+    inst[i].data[3] = f->readInt (1);
+    inst[i].data[4] = f->readInt (1);
+    inst[i].data[5] = f->readInt (1);
+    inst[i].data[6] = f->readInt (1);
+    inst[i].data[7] = f->readInt (1);
+    inst[i].data[8] = f->readInt (1);
+    inst[i].data[0] = f->readInt (1);
   }
-  for(i = 0; i < 128; i++) order[i] = f->readInt(1);
-  for(i = 0; i < 128 && order[i] != 128; i++) ; length = i;
-  npats = f->readInt(1);
-  for(i = 0; i < npats; i++) {
-    n = f->readInt(1);
-    for(r = 0; r < 64; r++)
-      for(c = 0; c < 9; c++) {
-	note = f->readInt(1);
-	if((note & 15) == 15)
-	  tracks[n*9+c][r].note = 127;	// key off
-	else
-	  tracks[n*9+c][r].note = ((note & 127) >> 4) * 12 + (note & 15);
-	if(note & 128) {	// additional effect byte
-	  fx = f->readInt(1);
-	  if(fx >> 5 == 1)
-	    tracks[n*9+c][r].inst = (fx & 31) + 1;
-	  else {
-	    tracks[n*9+c][r].command = convfx[fx >> 5];
-	    if(tracks[n*9+c][r].command == 17) {	// set volume
-	      param = fx & 31;
-	      param = 63 - param * 2;
-	      tracks[n*9+c][r].param1 = param >> 4;
-	      tracks[n*9+c][r].param2 = param & 15;
-	    } else {
-	      tracks[n*9+c][r].param1 = (fx & 31) >> 4;
-	      tracks[n*9+c][r].param2 = fx & 15;
-	    }
-	  }
-	}
+  for (i = 0; i < 128; i++)
+    order[i] = f->readInt (1);
+  for (i = 0; i < 128 && order[i] != 128; i++);
+  length = i;
+  npats = f->readInt (1);
+  for (i = 0; i < npats; i++)
+  {
+    n = f->readInt (1);
+    for (r = 0; r < 64; r++)
+      for (c = 0; c < 9; c++)
+      {
+        note = f->readInt (1);
+        if ((note & 15) == 15)
+          tracks[n * 9 + c][r].note = 127;  // key off
+        else
+          tracks[n * 9 + c][r].note = ((note & 127) >> 4) * 12 + (note & 15);
+        if (note & 128)
+        {                       // additional effect byte
+          fx = f->readInt (1);
+          if (fx >> 5 == 1)
+            tracks[n * 9 + c][r].inst = (fx & 31) + 1;
+          else
+          {
+            tracks[n * 9 + c][r].command = convfx[fx >> 5];
+            if (tracks[n * 9 + c][r].command == 17)
+            {                   // set volume
+              param = fx & 31;
+              param = 63 - param * 2;
+              tracks[n * 9 + c][r].param1 = param >> 4;
+              tracks[n * 9 + c][r].param2 = param & 15;
+            }
+            else
+            {
+              tracks[n * 9 + c][r].param1 = (fx & 31) >> 4;
+              tracks[n * 9 + c][r].param2 = fx & 15;
+            }
+          }
+        }
 
       }
   }
 
-  fp.close(f);
-  rewind(0);
+  fp.close (f);
+  rewind (0);
   return true;
 }
 
-std::string CdfmLoader::gettype()
+std::string CdfmLoader::gettype ()
 {
-	char tmpstr[20];
+  char
+    tmpstr[20];
 
-	sprintf(tmpstr,"Digital-FM %d.%d",header.hiver,header.lover);
-	return std::string(tmpstr);
+  sprintf (tmpstr, "Digital-FM %d.%d", header.hiver, header.lover);
+  return std::string (tmpstr);
 }
 
-float CdfmLoader::getrefresh()
+float
+CdfmLoader::getrefresh ()
 {
-	return 125.0f;
+  return 125.0f;
 }