EHN: Enable the video message in the messagefactory

openigtlink · Dec 22, 2017 · 4162c0a · 4162c0a
1 parent c501689
commit 4162c0a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
@@ -30,14 +30,16 @@ if (${OpenIGTLink_PROTOCOL_VERSION} GREATER 1)
     )
 endif (${OpenIGTLink_PROTOCOL_VERSION} GREATER 1)
 
-
-IF(OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR (OpenIGTLink_USE_X265 AND OpenIGTLink_USE_OpenHEVC) AND (${OpenIGTLink_PROTOCOL_VERSION} GREATER 2))
-  SET(EXAMPLE_DIRS
-    ${EXAMPLE_DIRS}
-    VideoStreaming
-    )
+IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER 2)
+  IF(OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR (OpenIGTLink_USE_X265 AND OpenIGTLink_USE_OpenHEVC))
+    SET(EXAMPLE_DIRS
+      ${EXAMPLE_DIRS}
+      VideoStreaming
+      )
+  ENDIF()
 ENDIF()
 
+
 IF(USE_WEBSOCKET)
   SET(EXAMPLE_DIRS
     ${EXAMPLE_DIRS}

diff --git a/Source/igtlMessageFactory.cxx b/Source/igtlMessageFactory.cxx
@@ -36,6 +36,10 @@ PURPOSE.  See the above copyright notices for more information.
 #include "igtlCommandMessage.h"
 #endif // OpenIGTLink_PROTOCOL_VERSION >= 3
 
+#if OpenIGTLink_ENABLE_VIDEOSTREAMING && OpenIGTLink_PROTOCOL_VERSION >=3
+#include "igtlVideoMessage.h"
+#endif 
+
 #include "igtl_header.h"
 
 #include <algorithm>
@@ -87,6 +91,10 @@ MessageFactory::MessageFactory()
   this->AddMessageType("COMMAND", (PointerToMessageBaseNew)&igtl::CommandMessage::New);
   this->AddMessageType("RTS_COMMAND", (PointerToMessageBaseNew)&igtl::RTSCommandMessage::New);
 #endif
+
+#if OpenIGTLink_ENABLE_VIDEOSTREAMING && OpenIGTLink_PROTOCOL_VERSION >=3
+  this->AddMessageType("VIDEO", (PointerToMessageBaseNew)&igtl::VideoMessage::New);
+#endif 
 }