From 1bce9bf846eb1eb12656b34f338961213b8d53f5 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 13 Sep 2013 17:38:31 -0400
Subject: [PATCH] preferences: clamp only needs to have function scope

---
 daemon/src/preferences.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/daemon/src/preferences.cpp b/daemon/src/preferences.cpp
index 60fb102e04..dd91c710c9 100644
--- a/daemon/src/preferences.cpp
+++ b/daemon/src/preferences.cpp
@@ -436,13 +436,6 @@ AudioPreference::setRecordPath(const std::string &r)
     }
 }
 
-namespace {
-    double clamp(double min, double max, double val)
-    {
-        return std::min(max, std::max(min, val));
-    }
-}
-
 void AudioPreference::unserialize(const Conf::YamlNode &map)
 {
     map.getValue(AUDIO_API_KEY, &audioApi_);
@@ -454,6 +447,11 @@ void AudioPreference::unserialize(const Conf::YamlNode &map)
 
     map.getValue(ALWAYS_RECORDING_KEY, &alwaysRecording_);
     map.getValue(VOLUMEMIC_KEY, &volumemic_);
+
+    const auto clamp = [] (double min, double max, double val) {
+        return std::min(max, std::max(min, val));
+    };
+
     volumemic_ = clamp(-1.0, 1.0, volumemic_);
     map.getValue(VOLUMESPKR_KEY, &volumespkr_);
     volumespkr_ = clamp(-1.0, 1.0, volumespkr_);
-- 
GitLab