From f77ec4432dec902533f99cdcaf12c2aec15895ac Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Sun, 26 Apr 2009 01:34:46 +0300
Subject: [PATCH] getdetune() coding style cleanup

---
 util.c | 69 ++++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/util.c b/util.c
index 3c733f0..9252890 100644
--- a/util.c
+++ b/util.c
@@ -72,40 +72,59 @@ getdetune(
   unsigned short int coarsedetune,
   unsigned short int finedetune)
 {
-  REALTYPE det=0.0,octdet=0.0,cdet=0.0,findet=0.0;
+  REALTYPE octdet;
+  REALTYPE cdet;
+  REALTYPE findet;
 
-  //Get Octave
-  int octave=coarsedetune/1024;
-  if (octave>=8) octave-=16;
-  octdet=octave*1200.0;
+  // Get Octave
+  int octave = coarsedetune / 1024;
+  if (octave >= 8)
+  {
+    octave -= 16;
+  }
 
-  //Coarse and fine detune
-  int cdetune=coarsedetune%1024;
-  if (cdetune>512) cdetune-=1024;
+  octdet = octave * 1200.0;
+
+  // Coarse and fine detune
+  int cdetune = coarsedetune % 1024;
+  if (cdetune > 512)
+  {
+    cdetune -= 1024;
+  }
     
-  int fdetune=finedetune-8192;
+  int fdetune = finedetune - 8192;
 
-  switch (type){
+  switch (type)
+  {
 //  case 1: is used for the default (see below)
-  case 2: cdet=fabs(cdetune*10.0);
-    findet=fabs(fdetune/8192.0)*10.0;
-    break;
-  case 3: cdet=fabs(cdetune*100);
-    findet=pow(10,fabs(fdetune/8192.0)*3.0)/10.0-0.1;
+  case 2:
+    cdet = fabs(cdetune * 10.0);
+    findet = fabs(fdetune / 8192.0) * 10.0;
     break;
-  case 4: cdet=fabs(cdetune*701.95500087); //perfect fifth
-    findet=(pow(2,fabs(fdetune/8192.0)*12.0)-1.0)/4095*1200;
+  case 3:
+    cdet = fabs(cdetune * 100);
+    findet = pow(10, fabs(fdetune / 8192.0) * 3.0) / 10.0 - 0.1;
     break;
-    //case ...: need to update N_DETUNE_TYPES, if you'll add more
-  default:cdet=fabs(cdetune*50.0);
-    findet=fabs(fdetune/8192.0)*35.0;//almost like "Paul's Sound Designer 2"
+  case 4:
+    cdet = fabs(cdetune * 701.95500087); // perfect fifth
+    findet = (pow(2, fabs(fdetune / 8192.0) * 12.0) - 1.0) / 4095 * 1200;
     break;
-  };
-  if (finedetune<8192) findet=-findet;
-  if (cdetune<0) cdet=-cdet;
+  default:
+    cdet = fabs(cdetune * 50.0);
+    findet = fabs(fdetune / 8192.0) * 35.0; // almost like "Paul's Sound Designer 2"
+  }
+
+  if (finedetune < 8192)
+  {
+    findet =- findet;
+  }
+
+  if (cdetune < 0)
+  {
+    cdet =- cdet;
+  }
     
-  det=octdet+cdet+findet;
-  return(det);
+  return octdet + cdet + findet;
 }
 
 void
-- 
2.11.4.GIT