From 06a1236e0b419d099d00242af33fc4e908b42d83 Mon Sep 17 00:00:00 2001
From: Hannes Matuschek <hmatuschek@gmail.com>
Date: Wed, 23 Jul 2014 23:16:38 +0200
Subject: [PATCH] Fixed minors.

---
 src/demod.hh  |  8 ++++----
 src/traits.cc | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/demod.hh b/src/demod.hh
index 4ce441c..f0f3f7b 100644
--- a/src/demod.hh
+++ b/src/demod.hh
@@ -216,10 +216,10 @@ public:
 
     LogMessage msg(LOG_DEBUG);
     msg << "Configured FMDemod node:" << std::endl
-        << " sample-rate " << src_cfg.sampleRate() << std::endl
-        << " in-type / out-type " << src_cfg.type()
+        << " sample-rate: " << src_cfg.sampleRate() << std::endl
+        << " in-type / out-type: " << src_cfg.type()
         << " / " << Config::typeId<oScalar>() << std::endl
-        << " in-place " << (_can_overwrite ? "true" : "false") << std::endl
+        << " in-place: " << (_can_overwrite ? "true" : "false") << std::endl
         << " output scale: 2^" << _shift;
     Logger::get().log(msg);
 
@@ -256,7 +256,6 @@ protected:
     aabs = (a >= 0) ? a : -a;
     if (b >= 0) { angle = pi4 - pi4*(b-aabs) / (b+aabs); }
     else { angle = pi34 - pi4*(b+aabs) / (aabs-b); }
-    angle >>= 2;
     return (a >= 0) ? angle : -angle;
   }
 
@@ -270,6 +269,7 @@ protected:
         + SScalar(in[0].imag())*SScalar(last_value.imag());
     SScalar b = SScalar(in[0].imag())*SScalar(last_value.real())
         - SScalar(in[0].real())*SScalar(last_value.imag());
+
     // update last value
     last_value = in[0];
     // calc output (prob. overwriting the last value)
diff --git a/src/traits.cc b/src/traits.cc
index 279ec5c..9812f4f 100644
--- a/src/traits.cc
+++ b/src/traits.cc
@@ -4,24 +4,24 @@ using namespace sdr;
 
 
 const float Traits<uint8_t>::scale = 127;
-const size_t Traits<uint8_t>::shift = 6;
+const size_t Traits<uint8_t>::shift = 8;
 const float Traits< std::complex<uint8_t> >::scale = 127;
-const size_t Traits< std::complex<uint8_t> >::shift = 6;
+const size_t Traits< std::complex<uint8_t> >::shift = 8;
 
 const float Traits<int8_t>::scale = 127;
-const size_t Traits<int8_t>::shift = 6;
+const size_t Traits<int8_t>::shift = 8;
 const float Traits< std::complex<int8_t> >::scale = 127;
-const size_t Traits< std::complex<int8_t> >::shift = 6;
+const size_t Traits< std::complex<int8_t> >::shift = 8;
 
 const float Traits<uint16_t>::scale = 32767;
-const size_t Traits<uint16_t>::shift = 15;
+const size_t Traits<uint16_t>::shift = 16;
 const float Traits< std::complex<uint16_t> >::scale = 32767;
-const size_t Traits< std::complex<uint16_t> >::shift = 14;
+const size_t Traits< std::complex<uint16_t> >::shift = 16;
 
 const float Traits<int16_t>::scale = 32767;
-const size_t Traits<int16_t>::shift = 15;
+const size_t Traits<int16_t>::shift = 16;
 const float Traits< std::complex<int16_t> >::scale = 32767;
-const size_t Traits< std::complex<int16_t> >::shift = 14;
+const size_t Traits< std::complex<int16_t> >::shift = 16;
 
 const float Traits<float>::scale = 1;
 const size_t Traits<float>::shift = 0;