From fa155adc8c8bc0a021706c05bfdef8dd02042810 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 16 Jul 2013 15:50:37 -0700 Subject: [PATCH] register the shared message handler to fix voxel-server output --- libraries/shared/src/SharedUtil.cpp | 4 ++++ libraries/shared/src/SharedUtil.h | 6 +++++- voxel-server/src/main.cpp | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index 23b889bdab..72b5b02f15 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -188,6 +188,10 @@ bool cmdOptionExists(int argc, const char * argv[],const char* option) { return false; } +void sharedMessageHandler(QtMsgType type, const char* message) { + fprintf(stdout, "%s", message); +} + ////////////////////////////////////////////////////////////////////////////////////////// // Function: createVoxelEditMessage() // Description: creates an "insert" or "remove" voxel message for a voxel code diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h index 6973e4cec4..37443c2778 100644 --- a/libraries/shared/src/SharedUtil.h +++ b/libraries/shared/src/SharedUtil.h @@ -9,9 +9,11 @@ #ifndef __hifi__SharedUtil__ #define __hifi__SharedUtil__ +#include #include #include -#include + +#include #ifdef _WIN32 #include "Systime.h" @@ -66,6 +68,8 @@ void loadRandomIdentifier(unsigned char* identifierBuffer, int numBytes); const char* getCmdOption(int argc, const char * argv[],const char* option); bool cmdOptionExists(int argc, const char * argv[],const char* option); +void sharedMessageHandler(QtMsgType type, const char* message); + struct VoxelDetail { float x; float y; diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index df7011585d..40d2777ee6 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -377,7 +377,9 @@ void attachVoxelNodeDataToNode(Node* newNode) { int main(int argc, const char * argv[]) { pthread_mutex_init(&::treeLock, NULL); - + + qInstallMsgHandler(sharedMessageHandler); + NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, VOXEL_LISTEN_PORT); setvbuf(stdout, NULL, _IOLBF, 0);