diff --git a/external/mesytec-mvlc b/external/mesytec-mvlc index 55dcda2..b77701f 160000 --- a/external/mesytec-mvlc +++ b/external/mesytec-mvlc @@ -1 +1 @@ -Subproject commit 55dcda2e0288bdbe60e883cae796d11cacbe2078 +Subproject commit b77701fb3904fd46da95de89336af702a900b541 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6cb72ee..bc7a47c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,7 +21,7 @@ set(MVLC_NNG_NODE_WARN_FLAGS -Wall -Wextra -Wpedantic) #target_include_directories(dp_common INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) add_library(mesytec-node-nng mesytec_node_nng.cc) -target_include_directories(mesytec-node-nng PUBLIC $) +target_include_directories(mesytec-node-nng PUBLIC $) target_link_libraries(mesytec-node-nng PUBLIC nng PUBLIC spdlog) target_compile_features(mesytec-node-nng PUBLIC cxx_std_17) diff --git a/src/mesy_nng_pipeline_main.cc b/src/mesy_nng_pipeline_main.cc index ea76c68..12ea751 100644 --- a/src/mesy_nng_pipeline_main.cc +++ b/src/mesy_nng_pipeline_main.cc @@ -260,10 +260,7 @@ int main(int argc, char *argv[]) } #if 1 - nng_socket pipe0PubSocket; - - if (auto res = nng_pub0_open(&pipe0PubSocket)) - mesy_nng_fatal("nng_pub0_open", res); + nng_socket pipe0PubSocket = make_pub_socket(); if (auto res = nng_listen(pipe0PubSocket, "inproc://pipe0_pub", nullptr, 0)) mesy_nng_fatal("nng_listen pipe0_pub", res); diff --git a/src/pipeline.h b/src/pipeline.h new file mode 100644 index 0000000..f51444b --- /dev/null +++ b/src/pipeline.h @@ -0,0 +1,14 @@ +#ifndef CF3DAF23_18D2_419E_9DCC_3855C5A63226 +#define CF3DAF23_18D2_419E_9DCC_3855C5A63226 + +#include + +namespace mesytec::mnode::pipeline +{ + + + + +} + +#endif /* CF3DAF23_18D2_419E_9DCC_3855C5A63226 */