Skip to content

Commit d2e96e3

Browse files
leochan2009leochan2009
committed
EHN: Enable the video message in the messagefactory
1 parent c501689 commit d2e96e3

File tree

12 files changed

+118
-114
lines changed

12 files changed

+118
-114
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ OPTION(OpenIGTLink_USE_OpenHEVC "Link the OpenHEVC tree." OFF)
3636

3737
#-----------------------------------------------------------------------------
3838
# Configure WebSocket
39-
OPTION(USE_WEBSOCKET "Build the Websocket." OFF)
39+
OPTION(OpenIGTLink_USE_WEBSOCKET "Build the Websocket." OFF)
4040

4141
#-----------------------------------------------------------------------------
4242
# OpenIGTLink build configuration options.
@@ -165,8 +165,10 @@ IF(CMAKE_USE_PTHREADS)
165165
ENDIF()
166166

167167
SET(OpenIGTLink_ENABLE_VIDEOSTREAMING "0")
168-
IF (OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR OpenIGTLink_USE_X265 OR OpenIGTLink_USE_OpenHEVC)
169-
SET(OpenIGTLink_ENABLE_VIDEOSTREAMING "1")
168+
IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2")
169+
IF (OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR OpenIGTLink_USE_X265 OR OpenIGTLink_USE_OpenHEVC)
170+
SET(OpenIGTLink_ENABLE_VIDEOSTREAMING "1")
171+
ENDIF()
170172
ENDIF()
171173
#-----------------------------------------------------------------------------
172174
# Run superbuild script instead of library script

‎Examples/CMakeLists.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,17 @@ if (${OpenIGTLink_PROTOCOL_VERSION} GREATER 1)
3030
)
3131
endif (${OpenIGTLink_PROTOCOL_VERSION} GREATER 1)
3232

33-
34-
IF(OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR (OpenIGTLink_USE_X265 AND OpenIGTLink_USE_OpenHEVC) AND (${OpenIGTLink_PROTOCOL_VERSION} GREATER 2))
35-
SET(EXAMPLE_DIRS
36-
${EXAMPLE_DIRS}
37-
VideoStreaming
38-
)
33+
IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER 2)
34+
IF(OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR (OpenIGTLink_USE_X265 AND OpenIGTLink_USE_OpenHEVC))
35+
SET(EXAMPLE_DIRS
36+
${EXAMPLE_DIRS}
37+
VideoStreaming
38+
)
39+
ENDIF()
3940
ENDIF()
4041

41-
IF(USE_WEBSOCKET)
42+
43+
IF(OpenIGTLink_USE_WEBSOCKET)
4244
SET(EXAMPLE_DIRS
4345
${EXAMPLE_DIRS}
4446
WebSocket

‎Examples/VideoStreaming/VideoServer.cxx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ void* ThreadFunction(void * ptr)
138138
H264StreamEncoder->SetPicWidthAndHeight(Width,Height);
139139
H264StreamEncoder->InitializeEncoder();
140140
encoder = H264StreamEncoder;
141-
#endif
142-
143-
#if defined(OpenIGTLink_USE_VP9)
141+
#elif defined(OpenIGTLink_USE_VP9)
144142
VP9Encoder* VP9StreamEncoder = new VP9Encoder();
145143
VP9StreamEncoder->SetPicWidthAndHeight(Width,Height);
146144
VP9StreamEncoder->InitializeEncoder();

‎OpenIGTLinkConfig.cmake.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SET(OpenIGTLink_USE_VP9 @OpenIGTLink_USE_VP9@)
4545
SET(OpenIGTLink_USE_X265 @OpenIGTLink_USE_X265@)
4646
SET(OpenIGTLink_USE_OpenHEVC @OpenIGTLink_USE_OpenHEVC@)
4747
SET(OpenIGTLink_ENABLE_VIDEOSTREAMING "@OpenIGTLink_ENABLE_VIDEOSTREAMING@")
48-
SET(USE_WEBSOCKET @USE_WEBSOCKET@)
48+
SET(OpenIGTLink_USE_WEBSOCKET @OpenIGTLink_USE_WEBSOCKET@)
4949

5050
# Path to CableSwig configuration used by OpenIGTLink.
5151
SET(OpenIGTLink_CableSwig_DIR "@OpenIGTLink_CableSwig_DIR_CONFIG@")

‎Source/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,14 @@ IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2")
203203
ENDIF()
204204

205205
IF (NOT (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.04))
206-
IF(OpenIGTLink_USE_H264 OR OpenIGTLink_USE_VP9 OR OpenIGTLink_USE_X265 OR OpenIGTLink_USE_OpenHEVC)
206+
IF(OpenIGTLink_ENABLE_VIDEOSTREAMING)
207207
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/VideoStreaming/VideoStreaming.cmake)
208208
ENDIF()
209209

210210
#-----------------------------------------------------------------------------
211211
# Configure WebSocket
212212
# Create the link to the WebSocket libraries
213-
IF(USE_WEBSOCKET)
213+
IF(OpenIGTLink_USE_WEBSOCKET)
214214
FIND_PACKAGE(WebSocket REQUIRED)
215215
LIST(APPEND LINK_LIBS WebSocket)
216216

@@ -257,7 +257,7 @@ IF (NOT (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.04))
257257
IF(OpenIGTLink_USE_OpenHEVC AND (NOT OpenHEVC_FOUND))
258258
add_dependencies(OpenIGTLink OpenHEVC)
259259
ENDIF()
260-
IF(USE_WEBSOCKET)
260+
IF(OpenIGTLink_USE_WEBSOCKET)
261261
add_dependencies(OpenIGTLink WebSocket)
262262
ENDIF()
263263
ELSE()

‎Source/VideoStreaming/H264Encoder.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,7 @@ int H264Encoder::EncodeSingleFrameIntoVideoMSG(SourcePicture* pSrcPic, igtl::Vid
775775
videoMessage->SetBitStreamSize(sFbi.iFrameSizeInBytes);
776776
videoMessage->AllocateScalars();
777777
videoMessage->SetScalarType(videoMessage->TYPE_UINT8);
778+
videoMessage->SetCodecType(IGTL_VIDEO_CODEC_NAME_H264);
778779
videoMessage->SetEndian(igtl_is_little_endian()==true?2:1); //little endian is 2 big endian is 1
779780
videoMessage->SetWidth(pSrcPic->picWidth);
780781
videoMessage->SetHeight(pSrcPic->picHeight);

‎Source/VideoStreaming/VideoStreaming.cmake‎

Lines changed: 86 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,139 +1,136 @@
1-
# Add support for OpenIGTLink version 3
2-
IF(${OpenIGTLink_PROTOCOL_VERSION} GREATER "2")
3-
LIST(APPEND OpenIGTLink_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/Source/VideoStreaming)
4-
LIST(APPEND OpenIGTLink_SOURCES
5-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_video.c
6-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_videometa.c
7-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMessage.cxx
8-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkServer.cxx
9-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkReceiver.cxx
10-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlCodecCommonClasses.cxx
11-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMetaMessage.cxx
12-
)
13-
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
14-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming
15-
)
16-
LIST(APPEND OpenIGTLink_INCLUDE_FILES
17-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_video.h
18-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_videometa.h
19-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMessage.h
20-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkServer.h
21-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkReceiver.h
22-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlCodecCommonClasses.h
23-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMetaMessage.h
24-
)
25-
IF(OpenIGTLink_USE_H264)
26-
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_openh264.cmake)
27-
IF(EXISTS ${OpenH264_LIBRARY_DIR})
28-
LIST(APPEND OpenIGTLink_SOURCES
29-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Decoder.cxx
30-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Encoder.cxx
31-
)
32-
LIST(APPEND OpenIGTLink_INCLUDE_FILES
33-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Decoder.h
34-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Encoder.h
35-
)
36-
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
37-
${OpenH264_INCLUDE_DIR}
38-
)
39-
ELSE()
40-
MESSAGE("H264_LIBRARY no found. You could specify OpenH264_INCLUDE_DIR or OpenH264_LIBRARY_DIR")
41-
ENDIF()
42-
ENDIF()
43-
IF(OpenIGTLink_USE_VP9)
44-
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_VP9.cmake)
45-
IF(EXISTS ${VP9_LIBRARY_DIR})
46-
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
47-
${VP9_INCLUDE_DIR}
48-
)
49-
LIST(APPEND OpenIGTLink_SOURCES
50-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Decoder.cxx
51-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Encoder.cxx
1+
LIST(APPEND OpenIGTLink_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/Source/VideoStreaming)
2+
LIST(APPEND OpenIGTLink_SOURCES
3+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_video.c
4+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_videometa.c
5+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMessage.cxx
6+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkServer.cxx
7+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkReceiver.cxx
8+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlCodecCommonClasses.cxx
9+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMetaMessage.cxx
10+
)
11+
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
12+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming
13+
)
14+
LIST(APPEND OpenIGTLink_INCLUDE_FILES
15+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_video.h
16+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtl_videometa.h
17+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMessage.h
18+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkServer.h
19+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VideoStreamIGTLinkReceiver.h
20+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlCodecCommonClasses.h
21+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/igtlVideoMetaMessage.h
22+
)
23+
IF(OpenIGTLink_USE_H264)
24+
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_openh264.cmake)
25+
IF(EXISTS ${OpenH264_LIBRARY_DIR})
26+
LIST(APPEND OpenIGTLink_SOURCES
27+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Decoder.cxx
28+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Encoder.cxx
5229
)
53-
LIST(APPEND OpenIGTLink_INCLUDE_FILES
54-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Decoder.h
55-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Encoder.h
30+
LIST(APPEND OpenIGTLink_INCLUDE_FILES
31+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Decoder.h
32+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H264Encoder.h
5633
)
57-
IF(NOT ${VP9_LIBRARY_DIR} EQUAL "")
58-
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
59-
"${VP9_LIBRARY_DIR}" )
60-
LINK_DIRECTORIES("${VP9_LIBRARY_DIR}/lib")
61-
ENDIF()
62-
ELSE()
63-
MESSAGE("VP9_INCLUDE_DIR or VP9_LIBRARY_DIR no found")
64-
ENDIF()
65-
ENDIF()
66-
67-
IF(OpenIGTLink_USE_X265)
68-
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_X265.cmake)
6934
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
70-
${X265_INCLUDE_DIR}
71-
${X265_LIBRARY_DIR}
72-
)
73-
LIST(APPEND OpenIGTLink_SOURCES
74-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Encoder.cxx
75-
)
76-
LIST(APPEND OpenIGTLink_INCLUDE_FILES
77-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Encoder.h
35+
${OpenH264_INCLUDE_DIR}
7836
)
37+
ELSE()
38+
MESSAGE("H264_LIBRARY no found. You could specify OpenH264_INCLUDE_DIR or OpenH264_LIBRARY_DIR")
7939
ENDIF()
80-
81-
IF(OpenIGTLink_USE_OpenHEVC)
82-
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_openHEVC.cmake)
40+
ENDIF()
41+
IF(OpenIGTLink_USE_VP9)
42+
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_VP9.cmake)
43+
IF(EXISTS ${VP9_LIBRARY_DIR})
8344
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
84-
${OpenHEVC_INCLUDE_DIR}
45+
${VP9_INCLUDE_DIR}
8546
)
8647
LIST(APPEND OpenIGTLink_SOURCES
87-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Decoder.cxx
48+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Decoder.cxx
49+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Encoder.cxx
8850
)
89-
LIST(APPEND OpenIGTLink_INCLUDE_FILES
90-
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Decoder.h
51+
LIST(APPEND OpenIGTLink_INCLUDE_FILES
52+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Decoder.h
53+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/VP9Encoder.h
9154
)
55+
IF(NOT ${VP9_LIBRARY_DIR} EQUAL "")
56+
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
57+
"${VP9_LIBRARY_DIR}" )
58+
LINK_DIRECTORIES("${VP9_LIBRARY_DIR}/lib")
59+
ENDIF()
60+
ELSE()
61+
MESSAGE("VP9_INCLUDE_DIR or VP9_LIBRARY_DIR no found")
9262
ENDIF()
9363
ENDIF()
9464

65+
IF(OpenIGTLink_USE_X265)
66+
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_X265.cmake)
67+
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
68+
${X265_INCLUDE_DIR}
69+
${X265_LIBRARY_DIR}
70+
)
71+
LIST(APPEND OpenIGTLink_SOURCES
72+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Encoder.cxx
73+
)
74+
LIST(APPEND OpenIGTLink_INCLUDE_FILES
75+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Encoder.h
76+
)
77+
ENDIF()
78+
79+
IF(OpenIGTLink_USE_OpenHEVC)
80+
INCLUDE(${OpenIGTLink_SOURCE_DIR}/SuperBuild/External_openHEVC.cmake)
81+
LIST(APPEND OpenIGTLink_INCLUDE_DIRS
82+
${OpenHEVC_INCLUDE_DIR}
83+
)
84+
LIST(APPEND OpenIGTLink_SOURCES
85+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Decoder.cxx
86+
)
87+
LIST(APPEND OpenIGTLink_INCLUDE_FILES
88+
${PROJECT_SOURCE_DIR}/Source/VideoStreaming/H265Decoder.h
89+
)
90+
ENDIF()
91+
9592
IF(WIN32) # for Windows
96-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_H264)
93+
IF(OpenIGTLink_USE_H264)
9794
LIST(APPEND LINK_LIBS
9895
${OpenH264_LIBRARY_DIR}/openh264.lib
9996
)
10097
ENDIF()
101-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_VP9)
98+
IF(OpenIGTLink_USE_VP9)
10299
#To do, library name depends on the compiler setting, could be vpxmt.lib and vpxmtd also. Make sure the setting matches.
103100
LIST(APPEND LINK_LIBS
104101
VP9_lib
105102
)
106103
ENDIF()
107-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_X265)
104+
IF(OpenIGTLink_USE_X265)
108105
#To do, library name depends on the compiler setting, could be vpxmt.lib and vpxmtd also. Make sure the setting matches.
109106
SET(LINK_X265_LIBRARY optimized ${X265_LIBRARY_DIR}\\Release\\x265-static.lib debug ${X265_LIBRARY_DIR}\\Debug\\x265-static.lib)
110107
LIST(APPEND LINK_LIBS
111108
${LINK_X265_LIBRARY}
112109
)
113110
ENDIF()
114-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_OpenHEVC)
111+
IF(OpenIGTLink_USE_OpenHEVC)
115112
#To do, library name depends on the compiler setting, could be vpxmt.lib and vpxmtd also. Make sure the setting matches.
116113
LIST(APPEND LINK_LIBS
117114
${OpenHEVC_LIBRARY}
118115
)
119116
ENDIF()
120117
ELSE() # for POSIX-compatible OSs
121-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_H264)
118+
IF(OpenIGTLink_USE_H264)
122119
LIST(APPEND LINK_LIBS
123120
${OpenH264_LIBRARY_DIR}/libopenh264.a
124121
)
125122
ENDIF()
126-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_VP9)
123+
IF(OpenIGTLink_USE_VP9)
127124
LIST(APPEND LINK_LIBS
128125
${VP9_LIBRARY_DIR}/libvpx.a
129126
)
130127
ENDIF()
131-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_X265)
128+
IF(OpenIGTLink_USE_X265)
132129
LIST(APPEND LINK_LIBS
133130
${X265_LIBRARY_DIR}/libx265.a
134131
)
135132
ENDIF()
136-
IF((${OpenIGTLink_PROTOCOL_VERSION} GREATER "2" ) AND OpenIGTLink_USE_OpenHEVC)
133+
IF(OpenIGTLink_USE_OpenHEVC)
137134
LIST(APPEND LINK_LIBS
138135
${OpenHEVC_LIBRARY}
139136
)

‎Source/igtlMessageFactory.cxx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ PURPOSE. See the above copyright notices for more information.
3636
#include "igtlCommandMessage.h"
3737
#endif // OpenIGTLink_PROTOCOL_VERSION >= 3
3838

39+
#if OpenIGTLink_ENABLE_VIDEOSTREAMING
40+
#include "igtlVideoMessage.h"
41+
#endif
42+
3943
#include "igtl_header.h"
4044

4145
#include <algorithm>
@@ -87,6 +91,10 @@ MessageFactory::MessageFactory()
8791
this->AddMessageType("COMMAND", (PointerToMessageBaseNew)&igtl::CommandMessage::New);
8892
this->AddMessageType("RTS_COMMAND", (PointerToMessageBaseNew)&igtl::RTSCommandMessage::New);
8993
#endif
94+
95+
#if OpenIGTLink_ENABLE_VIDEOSTREAMING
96+
this->AddMessageType("VIDEO", (PointerToMessageBaseNew)&igtl::VideoMessage::New);
97+
#endif
9098
}
9199

92100

‎Source/igtlMessageHandlerMacro.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@
122122
return this->m_Message->GetMessageType(); \
123123
} \
124124
virtual const char* GetMessageType() \
125-
{ \
126-
return this->m_Message->GetType(); \
127-
} \
128-
virtual const char* GetMessageType() \
129125
{ \
130126
return this->m_Message->GetDeviceType(); \
131127
} \

‎SuperBuild/Superbuild.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ IF(OpenIGTLink_USE_OpenHEVC)
3131
ENDIF()
3232
ENDIF()
3333

34-
IF(USE_WEBSOCKET)
34+
IF(OpenIGTLink_USE_WEBSOCKET)
3535
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/External_WebSocket.cmake)
3636
LIST(APPEND OpenIGTLink_DEPENDENCIES websocket)
3737
ENDIF()
@@ -58,7 +58,7 @@ ExternalProject_Add( OpenIGTLink-lib
5858
-DOpenIGTLink_USE_VP9:BOOL=${OpenIGTLink_USE_VP9}
5959
-DOpenIGTLink_USE_X265:BOOL=${OpenIGTLink_USE_X265}
6060
-DOpenIGTLink_USE_OpenHEVC:BOOL=${OpenIGTLink_USE_OpenHEVC}
61-
-DUSE_WEBSOCKET:BOOL=${USE_WEBSOCKET}
61+
-DOpenIGTLink_USE_WEBSOCKET:BOOL=${OpenIGTLink_USE_WEBSOCKET}
6262
-DBUILD_EXAMPLES:BOOL=${BUILD_EXAMPLES}
6363
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
6464
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}

0 commit comments

Comments
 (0)