From aa656f19d015febb1174c0c91cb1711657280c70 Mon Sep 17 00:00:00 2001
From: Jonas Suhr Christensen <jsc@umbraculum.org>
Date: Wed, 19 Mar 2014 21:11:31 +0100
Subject: Using power defined in xml if any.

---
 src/powerlist.cc | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/powerlist.cc')

diff --git a/src/powerlist.cc b/src/powerlist.cc
index 4f02892..cf843a3 100644
--- a/src/powerlist.cc
+++ b/src/powerlist.cc
@@ -168,16 +168,22 @@ void PowerList::finalise()
     master->load();
 
     float power = 0;
-    size_t s = 0;
-    for(; s < SIZE && s < master->size; s++) {
-      power += master->data[s] * master->data[s];
-    }
+    if(sample->power == -1) { // Power not defined. Calculate it!
+      DEBUG(powerlist, "Calculating power\n");
+      size_t s = 0;
+      for(; s < SIZE && s < master->size; s++) {
+        power += master->data[s] * master->data[s];
+      }
     
-    power = sqrt(power);
+      power = sqrt(power);
 
-    if(power > power_max) power_max = power;
+      if(power > power_max) power_max = power;
 
-    item.power = power;
+      item.power = power;
+    } else { // Power defined in xml
+      DEBUG(powerlist, "Using power from xml\n");
+      power = sample->power;
+    }
 
     DEBUG(rand, " - power: %f\n", power);
     
-- 
cgit v1.2.3