From 475861c4be6435c44f92fe8af74af79006539671 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 1 May 2015 16:30:25 -0700 Subject: [PATCH] move KILO_PER_MEGA to numerical constants --- assignment-client/src/avatars/AvatarMixer.cpp | 7 ++----- libraries/shared/src/NumericalConstants.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 4c7c5fdf32..06146ad677 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -435,8 +435,7 @@ void AvatarMixer::sendStatsPacket() { // add the diff between the full outbound bandwidth and the measured bandwidth for AvatarData send only avatarStats["delta_full_vs_avatar_data_kbps"] = - avatarStats[NODE_OUTBOUND_KBPS_STAT_KEY].toDouble() - avatarStats[OUTBOUND_AVATAR_DATA_STATS_KEY].toDouble(); - + avatarStats[NODE_OUTBOUND_KBPS_STAT_KEY].toDouble() - avatarStats[OUTBOUND_AVATAR_DATA_STATS_KEY].toDouble(); } avatarsObject[uuidStringWithoutCurlyBraces(node->getUUID())] = avatarStats; @@ -501,9 +500,7 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) { QJsonValue nodeBandwidthValue = domainSettings[AVATAR_MIXER_SETTINGS_KEY].toObject()[NODE_SEND_BANDWIDTH_KEY]; if (!nodeBandwidthValue.isDouble()) { qDebug() << NODE_SEND_BANDWIDTH_KEY << "is not a double - will continue with default value"; - } - - const int KILO_PER_MEGA = 1000; + } _maxKbpsPerNode = nodeBandwidthValue.toDouble(DEFAULT_NODE_SEND_BANDWIDTH) * KILO_PER_MEGA; qDebug() << "The maximum send bandwidth per node is" << _maxKbpsPerNode << "kbps."; diff --git a/libraries/shared/src/NumericalConstants.h b/libraries/shared/src/NumericalConstants.h index 6d1689fe4b..2582e3358b 100644 --- a/libraries/shared/src/NumericalConstants.h +++ b/libraries/shared/src/NumericalConstants.h @@ -37,6 +37,7 @@ const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND; const int BITS_IN_BYTE = 8; const int BYTES_PER_KILOBYTE = 1000; -const int BYTES_PER_KILOBIT = BYTES_PER_KILOBYTE / BITS_IN_BYTE; +const int BYTES_PER_KILOBIT = BYTES_PER_KILOBYTE / BITS_IN_BYTE; +const int KILO_PER_MEGA = 1000; #endif // hifi_NumericalConstants_h