mirror of
https://github.com/overte-org/overte.git
synced 2025-04-16 09:07:19 +02:00
fix some windows issues
Conflicts: assignment-client/src/audio/AudioMixer.cpp
This commit is contained in:
parent
5249a97697
commit
9c7ffffbae
5 changed files with 15 additions and 8 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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()) {
|
||||
|
|
Loading…
Reference in a new issue