From 54d73d4a6458df8041459b410e7cadd2382ebb5a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 12 Mar 2014 17:50:58 -0700 Subject: [PATCH] use floor since round is missing on windows --- assignment-client/src/Agent.cpp | 2 +- libraries/script-engine/src/ScriptEngine.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 9d4f07043d..46f4d233c2 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -40,7 +40,7 @@ Agent::~Agent() { delete _avatarAudioStream; } -const int SCRIPT_AUDIO_BUFFER_SAMPLES = (SCRIPT_DATA_CALLBACK_USECS * SAMPLE_RATE) / (1000 * 1000); +const int SCRIPT_AUDIO_BUFFER_SAMPLES = floor(((SCRIPT_DATA_CALLBACK_USECS * SAMPLE_RATE) / (1000 * 1000)) + 0.5); void Agent::setSendAvatarAudioStream(bool sendAvatarAudioStream) { if (sendAvatarAudioStream) { diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 7dadc17cc6..606d0aabf4 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -28,13 +28,7 @@ class ParticlesScriptingInterface; const QString NO_SCRIPT(""); -#ifdef Q_OS_WIN32 -inline double roundf(double value) { - return (value > 0.0) ? floor(value + 0.5) : ceil(value - 0.5); -} -#endif - -const unsigned int SCRIPT_DATA_CALLBACK_USECS = roundf((1.0 / 60.0) * 1000 * 1000); +const unsigned int SCRIPT_DATA_CALLBACK_USECS = floor(((1.0 / 60.0f) * 1000 * 1000) + 0.5); class ScriptEngine : public QObject { Q_OBJECT