diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 1caef22..08a9e0a 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/libxsync b/libxsync index 5592dbb..2b13245 160000 --- a/libxsync +++ b/libxsync @@ -1 +1 @@ -Subproject commit 5592dbb769b0b9262e534615d169ec52ab79bc2c +Subproject commit 2b13245af0874ddc7adce64ed6c6508eb45c7018 diff --git a/mainwindow.cpp b/mainwindow.cpp index 35b5a52..53b8f6e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" + #include "mainwindow.h" #include #include @@ -505,7 +505,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins()); XsyncInit(XSyncUdpFactoryImpl::Ins()); - xsync_config_t config = {0}; + xsync_config_t config = {0}; config.listenCameraSyncPacket = true; XsyncIns()->initialize(&config); XsyncIns()->registerOnConnectStateChangeCallback([this](bool state, string targetIp) { @@ -537,11 +537,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi XsyncIns()->registerOnTimecodeMsgCallback([this](XsyncTimecode_t *timecode_msg) { // XsyncTimecode_t timecode = *timecode_msg; QString text = QString(fmt("%02d:%02d:%02d:%02d:%02d", timecode.hour, timecode.minute, timecode.second, timecode.frame, timecode.subframe)); + ZLOGI(TAG, "%s", text.toStdString().c_str()); updateUI_timeCodeInfo_signal(text); }); XsyncIns()->registerOnCameraSyncMsgCallback([this](xysnc_camera_sync_data_t *camera_sync_msg) { // xysnc_camera_sync_data_t camera_sync_data = *camera_sync_msg; + ZLOGI(TAG, "SYNC:%d",camera_sync_msg->frameIndex ); updateUI_cameraSyncInfo_signal(QString(fmt("%d", camera_sync_data.frameIndex))); }); @@ -606,7 +608,6 @@ void MainWindow::mainWindowsRun() { // ZLOGE(TAG, "do: %s fail,ecode:[%d](%s)", #exptr, ecode, xs_error_code_2_str(ecode)); \ return; \ } else { \ - \ } \ }