From 9c7ffffbaefdfbe198b999cd246544995d668985 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 20 Mar 2014 21:55:08 -0700
Subject: [PATCH] fix some windows issues

Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
---
 assignment-client/src/audio/AudioMixer.cpp    |  4 ++--
 assignment-client/src/main.cpp                |  4 +++-
 assignment-client/src/octree/OctreeServer.cpp |  2 ++
 domain-server/src/main.cpp                    | 10 ++++++----
 libraries/shared/src/Logging.cpp              |  3 ++-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index f3b623bac2..769eb29342 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -382,8 +382,8 @@ void AudioMixer::run() {
         }
         
         const float STRUGGLE_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.10f;
-        const float BACK_OFF_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.20f;
-        const float CUTOFF_DELTA = 0.02f;
+        const float BACK_OFF_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.30f;
+        const float CUTOFF_EPSILON = 0.0001f;
         
         const float CURRENT_FRAME_RATIO = 1.0f / TRAILING_AVERAGE_FRAMES;
         const float PREVIOUS_FRAMES_RATIO = 1.0f - CURRENT_FRAME_RATIO;
diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index 7ee0ea9e14..0151f93319 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -15,8 +15,10 @@
 
 int main(int argc, char* argv[]) {
     
+#ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
-    
+#endif
+
     // use the verbose message handler in Logging
     qInstallMessageHandler(Logging::verboseMessageHandler);
     
diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 496f9af1a0..d4dfa80724 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -880,7 +880,9 @@ void OctreeServer::run() {
     // we need to ask the DS about agents so we can ping/reply with them
     nodeList->addNodeTypeToInterestSet(NodeType::Agent);
 
+#ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
+#endif
 
     nodeList->linkedDataCreateCallback = &OctreeServer::attachQueryNodeToNode;
 
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 1d9f554237..f18bb05c64 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -20,11 +20,13 @@
 
 int main(int argc, char* argv[]) {
     
+#ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
-    
-    qInstallMessageHandler(Logging::verboseMessageHandler);
-    
-    DomainServer domainServer(argc, argv);
+#endif
+
+	qInstallMessageHandler(Logging::verboseMessageHandler);
+
+	DomainServer domainServer(argc, argv);
     
     return domainServer.exec();
 }
diff --git a/libraries/shared/src/Logging.cpp b/libraries/shared/src/Logging.cpp
index 1713382fcf..1fa4052569 100644
--- a/libraries/shared/src/Logging.cpp
+++ b/libraries/shared/src/Logging.cpp
@@ -86,7 +86,8 @@ const char* stringForLogType(QtMsgType msgType) {
 }
 
 // the following will produce 2000-10-02 13:55:36 -0700
-const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z";
+const char DATE_STRING_FORMAT[] = "%Y-%m-%d %H:%M:%S %z";
+//const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z";
 
 void Logging::verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
     if (message.isEmpty()) {