From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:12:41 +0800
Subject: [PATCH] 合并代码解决冲突
---
QiaoJiaSystem/VideoToImageMulth/main.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/main.cpp b/QiaoJiaSystem/VideoToImageMulth/main.cpp
index ec98d46..684fd82 100644
--- a/QiaoJiaSystem/VideoToImageMulth/main.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/main.cpp
@@ -36,11 +36,10 @@
appPref.setLongData("gpu.index", 1);
appPref.setIntData("show.image", 0);
+ //todo
+ appPref.setIntData("CamStart", atoi(argv[1]));
+ appPref.setIntData("CamStep", atoi(argv[2]));
-
-// LDBTool _dbTool;
-// thread startRtspAnalys(startManager, &_dbTool);
-// startRtspAnalys.detach();
appPref.setStringData("user.loop.absolute.path", appConfig.getStringProperty("cutPath"));
IceRpcServer<RtspAnalysManager> server("RtspAnalysServer", 10009, "tcp");
server.setMessageSizeMax(1024 * 1024 * 50);
--
Gitblit v1.8.0