Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:28:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix some windows issues

Browse source 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
This commit is contained in:
ZappoMan 2014-03-20 21:55:08 -07:00 committed by ZappoMan
parent 5249a97697
commit 9c7ffffbae
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/audio/AudioMixer.cpp
View file

@ -382,8 +382,8 @@ void AudioMixer::run() {
} }
const float STRUGGLE_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.10f; const float STRUGGLE_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.10f;
const float BACK_OFF_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.20f; const float BACK_OFF_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.30f;
const float CUTOFF_DELTA = 0.02f; const float CUTOFF_EPSILON = 0.0001f;
const float CURRENT_FRAME_RATIO = 1.0f / TRAILING_AVERAGE_FRAMES; const float CURRENT_FRAME_RATIO = 1.0f / TRAILING_AVERAGE_FRAMES;
const float PREVIOUS_FRAMES_RATIO = 1.0f - CURRENT_FRAME_RATIO; const float PREVIOUS_FRAMES_RATIO = 1.0f - CURRENT_FRAME_RATIO;

2
assignment-client/src/main.cpp
View file

@ -15,7 +15,9 @@
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
#endif
// use the verbose message handler in Logging // use the verbose message handler in Logging
qInstallMessageHandler(Logging::verboseMessageHandler); qInstallMessageHandler(Logging::verboseMessageHandler);

2
assignment-client/src/octree/OctreeServer.cpp
View file

@ -880,7 +880,9 @@ void OctreeServer::run() {
// we need to ask the DS about agents so we can ping/reply with them // we need to ask the DS about agents so we can ping/reply with them
nodeList->addNodeTypeToInterestSet(NodeType::Agent); nodeList->addNodeTypeToInterestSet(NodeType::Agent);
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
#endif
nodeList->linkedDataCreateCallback = &OctreeServer::attachQueryNodeToNode; nodeList->linkedDataCreateCallback = &OctreeServer::attachQueryNodeToNode;

2
domain-server/src/main.cpp
View file

@ -20,7 +20,9 @@
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
#endif
qInstallMessageHandler(Logging::verboseMessageHandler); qInstallMessageHandler(Logging::verboseMessageHandler);

3
libraries/shared/src/Logging.cpp
View file

@ -86,7 +86,8 @@ const char* stringForLogType(QtMsgType msgType) {
} }
// the following will produce 2000-10-02 13:55:36 -0700 // 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) { void Logging::verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
if (message.isEmpty()) { if (message.isEmpty()) {