Merge branch 'master' of https://github.com/worklist/hifi into js_prefs

assignment-client/src/audio/AudioMixer.cpp

@@ -66,8 +66,7 @@ void attachNewBufferToNode(Node *newNode) {
 AudioMixer::AudioMixer(const QByteArray& packet) :
     ThreadedAssignment(packet),
     _trailingSleepRatio(1.0f),
-    _minAudibilityThreshold(LOUDNESS_TO_DISTANCE_RATIO / 2.0f),
-    _numClientsMixedInFrame(0)
+    _minAudibilityThreshold(LOUDNESS_TO_DISTANCE_RATIO / 2.0f)
 {
     
 }
@@ -95,8 +94,6 @@ void AudioMixer::addBufferToMixForListeningNodeWithBuffer(PositionalAudioRingBuf
             return;
         }
         
-        ++_numClientsMixedInFrame;
-        
         glm::quat inverseOrientation = glm::inverse(listeningNodeBuffer->getOrientation());
         
         float distanceSquareToSource = glm::dot(relativePosition, relativePosition);
@@ -448,8 +445,6 @@ void AudioMixer::run() {
                 nodeList->writeDatagram(clientMixBuffer, NETWORK_BUFFER_LENGTH_BYTES_STEREO + numBytesPacketHeader, node);
             }
         }
-        
-        _numClientsMixedInFrame = 0;
 
         // push forward the next output pointers for any audio buffers we used
         foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {

assignment-client/src/audio/AudioMixer.h

@@ -42,7 +42,6 @@ private:
     
     float _trailingSleepRatio;
     float _minAudibilityThreshold;
-    int _numClientsMixedInFrame;
 };
 
 #endif /* defined(__hifi__AudioMixer__) */

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);
     

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;
 

domain-server/src/main.cpp

@@ -20,10 +20,11 @@
 
 int main(int argc, char* argv[]) {
     
+#ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
-    
+#endif
+
     qInstallMessageHandler(Logging::verboseMessageHandler);
-    
     DomainServer domainServer(argc, argv);
     
     return domainServer.exec();

libraries/shared/src/Logging.cpp

@@ -86,7 +86,7 @@ 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";
 
 void Logging::verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
     if (message.isEmpty()) {