diff src/adplug/core/sng.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/sng.cxx	Sat Apr 14 08:48:41 2007 -0700
+++ b/src/adplug/core/sng.cxx	Sat Apr 14 15:23:50 2007 -0700
@@ -21,64 +21,91 @@
 
 #include "sng.h"
 
-CPlayer *CsngPlayer::factory(Copl *newopl)
+CPlayer *
+CsngPlayer::factory (Copl * newopl)
 {
-  return new CsngPlayer(newopl);
+  return new CsngPlayer (newopl);
 }
 
-bool CsngPlayer::load(VFSFile *fd, const CFileProvider &fp)
+bool
+CsngPlayer::load (VFSFile * fd, const CFileProvider & fp)
 {
-  binistream *f = fp.open(fd); if(!f) return false;
+  binistream *f = fp.open (fd);
+  if (!f)
+    return false;
   int i;
 
   // load header
-  f->readString(header.id, 4);
-  header.length = f->readInt(2); header.start = f->readInt(2);
-  header.loop = f->readInt(2); header.delay = f->readInt(1);
-  header.compressed = f->readInt(1) ? true : false;
+  f->readString (header.id, 4);
+  header.length = f->readInt (2);
+  header.start = f->readInt (2);
+  header.loop = f->readInt (2);
+  header.delay = f->readInt (1);
+  header.compressed = f->readInt (1) ? true : false;
 
   // file validation section
-  if(strncmp(header.id,"ObsM",4)) { fp.close(f); return false; }
+  if (strncmp (header.id, "ObsM", 4))
+  {
+    fp.close (f);
+    return false;
+  }
 
   // load section
-  header.length /= 2; header.start /= 2; header.loop /= 2;
-  data = new Sdata [header.length];
-  for(i = 0; i < header.length; i++) {
-    data[i].val = f->readInt(1);
-    data[i].reg = f->readInt(1);
+  header.length /= 2;
+  header.start /= 2;
+  header.loop /= 2;
+  data = new Sdata[header.length];
+  for (i = 0; i < header.length; i++)
+  {
+    data[i].val = f->readInt (1);
+    data[i].reg = f->readInt (1);
   }
 
-  rewind(0);
-  fp.close(f);
+  rewind (0);
+  fp.close (f);
   return true;
 }
 
-bool CsngPlayer::update()
+bool
+CsngPlayer::update ()
 {
-  if(header.compressed && del) {
+  if (header.compressed && del)
+  {
     del--;
     return !songend;
   }
 
-  while(data[pos].reg) {
-    opl->write(data[pos].reg, data[pos].val);
+  while (data[pos].reg)
+  {
+    opl->write (data[pos].reg, data[pos].val);
     pos++;
-    if(pos >= header.length) {
+    if (pos >= header.length)
+    {
       songend = true;
       pos = header.loop;
     }
   }
 
-  if(!header.compressed)
-    opl->write(data[pos].reg, data[pos].val);
+  if (!header.compressed)
+    opl->write (data[pos].reg, data[pos].val);
 
-  if(data[pos].val) del = data[pos].val - 1; pos++;
-  if(pos >= header.length) { songend = true; pos = header.loop; }
+  if (data[pos].val)
+    del = data[pos].val - 1;
+  pos++;
+  if (pos >= header.length)
+  {
+    songend = true;
+    pos = header.loop;
+  }
   return !songend;
 }
 
-void CsngPlayer::rewind(int subsong)
+void
+CsngPlayer::rewind (int subsong)
 {
-  pos = header.start; del = header.delay; songend = false;
-  opl->init(); opl->write(1,32);	// go to OPL2 mode
+  pos = header.start;
+  del = header.delay;
+  songend = false;
+  opl->init ();
+  opl->write (1, 32);           // go to OPL2 mode
 }