From 70e08d1325b2cdd0e9c16a193cc6ed10d2d21617 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 17 Feb 2017 12:34:51 +0100
Subject: Win32 build fixes.
---
src/mutex.h | 4 +++-
src/powerlist.cc | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/mutex.h b/src/mutex.h
index 7e31296..067a4db 100644
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -27,6 +27,8 @@
*/
#pragma once
+#include "platform.h"
+
struct mutex_private_t;
class Mutex {
@@ -42,7 +44,7 @@ private:
struct mutex_private_t* prv;
};
-#ifdef WIN32
+#if DG_PLATFORM == DG_PLATFORM_WINDOWS
// Hack: mingw doesn't have std::mutex
namespace std {
class mutex : public Mutex {};
diff --git a/src/powerlist.cc b/src/powerlist.cc
index 9b0bd77..b502d03 100644
--- a/src/powerlist.cc
+++ b/src/powerlist.cc
@@ -48,7 +48,7 @@ unsigned int const MIN_SAMPLE_SET_SIZE = 26u;
// Enable to calculate power on old samples without power attribute
//#define AUTO_CALCULATE_POWER
-unsigned int const SIZE = 500u;
+unsigned int const LOAD_SIZE = 500u;
PowerList::PowerList(Random& rand)
: rand(rand)
@@ -82,7 +82,7 @@ Channel* PowerList::getMasterChannel()
Channel* c = pair.first;
AudioFile* af = pair.second;
- af->load(SIZE);
+ af->load(LOAD_SIZE);
float silence{0.f};
std::size_t silence_length{4u};
@@ -176,7 +176,7 @@ void PowerList::finalise()
DEBUG(powerlist, "Calculating power\n");
float power{0.f};
- for(auto s = 0u; s < SIZE && s < master->size; ++s)
+ for(auto s = 0u; s < LOAD_SIZE && s < master->size; ++s)
{
power += master->data[s] * master->data[s];
}
--
cgit v1.2.3