Browse Source

update

master
zhaohe 1 year ago
parent
commit
ea7a40e611
  1. 2
      CMakeLists.txt.user
  2. 2
      libxsync
  3. 7
      mainwindow.cpp

2
CMakeLists.txt.user

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 5.0.2, 2024-03-07T14:22:32. -->
<!-- Written by QtCreator 5.0.2, 2024-04-11T10:19:25. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

2
libxsync

@ -1 +1 @@
Subproject commit 5592dbb769b0b9262e534615d169ec52ab79bc2c
Subproject commit 2b13245af0874ddc7adce64ed6c6508eb45c7018

7
mainwindow.cpp

@ -1,4 +1,4 @@
#include "mainwindow.h"
#include "mainwindow.h"
#include <QDateTime> #include <QDateTime>
#include <QtConcurrent> #include <QtConcurrent>
@ -505,7 +505,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
// XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins()); // XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins());
XsyncInit(XSyncUdpFactoryImpl::Ins()); XsyncInit(XSyncUdpFactoryImpl::Ins());
xsync_config_t config = {0};
xsync_config_t config = {0};
config.listenCameraSyncPacket = true; config.listenCameraSyncPacket = true;
XsyncIns()->initialize(&config); XsyncIns()->initialize(&config);
XsyncIns()->registerOnConnectStateChangeCallback([this](bool state, string targetIp) { 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) { // XsyncIns()->registerOnTimecodeMsgCallback([this](XsyncTimecode_t *timecode_msg) { //
XsyncTimecode_t timecode = *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)); 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); updateUI_timeCodeInfo_signal(text);
}); });
XsyncIns()->registerOnCameraSyncMsgCallback([this](xysnc_camera_sync_data_t *camera_sync_msg) { // XsyncIns()->registerOnCameraSyncMsgCallback([this](xysnc_camera_sync_data_t *camera_sync_msg) { //
xysnc_camera_sync_data_t camera_sync_data = *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))); 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)); \ ZLOGE(TAG, "do: %s fail,ecode:[%d](%s)", #exptr, ecode, xs_error_code_2_str(ecode)); \
return; \ return; \
} else { \ } else { \
\
} \ } \
} }

Loading…
Cancel
Save