Browse Source

update

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

2
CMakeLists.txt

@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets console REQUIRED)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Charts Concurrent REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Charts Concurrent REQUIRED)
include_directories(libxsync/include) include_directories(libxsync/include)

3
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-06T14:20:04. -->
<!-- Written by QtCreator 5.0.2, 2024-03-07T14:22:32. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -532,7 +532,6 @@
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value> <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/workspace/p_lusterinc/build-xsync_pc-Desktop_Qt_5_12_12_MSVC2017_64bit-Debug</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>

2
libxsync

@ -1 +1 @@
Subproject commit 8f83a2bf5e1f987871e4342f032ae8c080aa4f07
Subproject commit 8d566302ea775dfe97f7f86b136cfbbe2888041f

16
mainwindow.cpp

@ -472,7 +472,17 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
// m_xsync.reset(new Xsync()); // m_xsync.reset(new Xsync());
// XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins()); // XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins());
XsyncInit(XSyncUdpFactoryImpl::Ins(), "192.168.8.10");
XsyncInit(XSyncUdpFactoryImpl::Ins());
xsync_config_t config = {0};
XsyncIns()->initialize(&config);
XsyncIns()->registerOnConnectStateChangeCallback([this](string targetIp, bool state) {
ZLOGI(TAG, "targetIp:%s,state:%d", targetIp.c_str(), state);
if (state) {
emit doinui_signal(QFunction([this, targetIp]() { ui->IpInput->setText(QString::fromStdString(targetIp)); }));
} else {
emit doinui_signal(QFunction([this, targetIp]() { ui->IpInput->setText(QString::fromStdString("disconnect")); }));
}
});
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", timecode.hour, timecode.minute, timecode.second, timecode.frame)); QString text = QString(fmt("%02d:%02d:%02d:%02d", timecode.hour, timecode.minute, timecode.second, timecode.frame));
@ -533,7 +543,7 @@ void MainWindow::on_ClearLogButton_clicked() { //
ui->logbrowser->clear(); ui->logbrowser->clear();
} }
void MainWindow::on_Connect2XsyncButton_clicked() { // void MainWindow::on_Connect2XsyncButton_clicked() { //
XsyncIns()->changeXsyncIp(ui->IpInput->text().toStdString());
// XsyncIns()->changeXsyncIp(ui->IpInput->text().toStdString());
} }
void MainWindow::mainWindowsRun() { // void MainWindow::mainWindowsRun() { //
} }
@ -553,7 +563,7 @@ void MainWindow::on_GenNewMac_clicked() { DO_XSYNC_FUNC(XsyncIns()->generatorNew
void MainWindow::on_FactoryReset_clicked() { DO_XSYNC_FUNC(XsyncIns()->factoryReset()); } void MainWindow::on_FactoryReset_clicked() { DO_XSYNC_FUNC(XsyncIns()->factoryReset()); }
void MainWindow::on_Reboot_clicked() { DO_XSYNC_FUNC(XsyncIns()->reboot()); } void MainWindow::on_Reboot_clicked() { DO_XSYNC_FUNC(XsyncIns()->reboot()); }
void MainWindow::on_ChangeNetCfg_clicked() { // void MainWindow::on_ChangeNetCfg_clicked() { //
DO_XSYNC_FUNC(XsyncIns()->changeNetworkConfig(ui->ChangeNetCfg_ip->text().toStdString(), ui->ChangeNetCfg_mask->text().toStdString(), ui->ChangeNetCfg_gateway->text().toStdString()));
// DO_XSYNC_FUNC(XsyncIns()->changeNetworkConfig(ui->ChangeNetCfg_ip->text().toStdString(), ui->ChangeNetCfg_mask->text().toStdString(), ui->ChangeNetCfg_gateway->text().toStdString()));
} }
void MainWindow::on_TimecodePage_Read_clicked() { void MainWindow::on_TimecodePage_Read_clicked() {

Loading…
Cancel
Save