From 94c4352c150f3d559301a8c1f9a5baa2b5ff0394 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 27 Mar 2024 15:24:45 +0800 Subject: [PATCH] update --- include/ixsync.hpp | 9 +++++---- src/xsync_v2.cpp | 17 ++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/ixsync.hpp b/include/ixsync.hpp index dc5c3a9..9951018 100644 --- a/include/ixsync.hpp +++ b/include/ixsync.hpp @@ -22,7 +22,7 @@ typedef function xsync_ typedef function xsync_on_camera_sync_msg_t; typedef struct { - bool placeholder; + bool listenCameraSyncPacket; } xsync_config_t; typedef struct { @@ -348,9 +348,10 @@ class IXsync { * */ - virtual xs_error_code_t TTLOutputModule_setSrcSigType(int index, SignalType_t source) = 0; - virtual xs_error_code_t TTLOutputModule_getSrcSigType(int index, SignalType_t &source) = 0; - virtual xs_error_code_t TTLOutputModule_setFreqDivision(int index, uint32_t div) = 0; + virtual xs_error_code_t TTLOutputModule1_setSrcSigType(SignalType_t source) = 0; + virtual xs_error_code_t TTLOutputModule1_getSrcSigType(SignalType_t &source) = 0; + virtual xs_error_code_t TTLOutputModule1_setFreqDivision(uint32_t div) = 0; + virtual xs_error_code_t TTLOutputModule_getFreqDivision(int index, uint32_t &div) = 0; virtual xs_error_code_t TTLOutputModule_setFreqMultiplication(int index, uint32_t multi) = 0; virtual xs_error_code_t TTLOutputModule_getFreqMultiplication(int index, uint32_t &multi) = 0; diff --git a/src/xsync_v2.cpp b/src/xsync_v2.cpp index 8983d05..dbe3fbe 100644 --- a/src/xsync_v2.cpp +++ b/src/xsync_v2.cpp @@ -158,13 +158,16 @@ class Xsync : public IXsync { #if 1 // 相机同步包 - xsync_camera_sync_udp_listener = g_xsync_udp_factory->createXSUDP(); - ecode = xsync_camera_sync_udp_listener->initialize("0.0.0.0", IFLYTOP_XSYNC_CAMERA_SYNC_PACKET_PC_PORT); - if (ecode != kxs_ec_success) goto err; - ecode = xsync_camera_sync_udp_listener->startReceive([this](XsyncNetAdd &from, uint8_t *data, size_t length) { // - parseCameraSyncMsgAndReport(from, data, length); - }); - if (ecode != kxs_ec_success) goto err; + if (config->listenCameraSyncPacket) { + xsync_camera_sync_udp_listener = g_xsync_udp_factory->createXSUDP(); + ecode = xsync_camera_sync_udp_listener->initialize("0.0.0.0", IFLYTOP_XSYNC_CAMERA_SYNC_PACKET_PC_PORT); + if (ecode != kxs_ec_success) goto err; + ecode = xsync_camera_sync_udp_listener->startReceive([this](XsyncNetAdd &from, uint8_t *data, size_t length) { // + parseCameraSyncMsgAndReport(from, data, length); + }); + if (ecode != kxs_ec_success) goto err; + } + #endif m_xsync_timecode_udp_listener = xsync_timecode_udp_listener;