From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"
---
QiaoJiaSystem/StructureApp/main.cpp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/main.cpp b/QiaoJiaSystem/StructureApp/main.cpp
index c820521..449e7a7 100644
--- a/QiaoJiaSystem/StructureApp/main.cpp
+++ b/QiaoJiaSystem/StructureApp/main.cpp
@@ -88,21 +88,21 @@
auto size = vec.size();
// int size = 1;
int pos = 0;
- AppPipeController _AppPipeController("test12344", json, true);
+ // AppPipeController _AppPipeController("test12344", json, true);
// AppPipeController _AppPipeController(src_path, json);
- _AppPipeController.setfdfsClient(&fdfsClient);
+// _AppPipeController.setfdfsClient(&fdfsClient);
// for (; pos < size;) {
//
// //#todo
// _AppPipeController.resetVideoCapturePath(vec[pos++]);
// _AppPipeController.resetVideoCapturePath(
// "/home/basic/work/qiaojia/cut/DS-7808N-SN0820161208AARR691369356WCVU/34/201810/11/DS-7808N-SN0820161208AARR691369356WCVU-34-20181011090000/2018-10-11 09:48:05.mp4");
- _AppPipeController.start();
- while (_AppPipeController.getRunning()) {
- usleep(40000);
- }
- _AppPipeController.stop();
- _AppPipeController.wait();
+// _AppPipeController.start();
+// while (_AppPipeController.getRunning()) {
+// usleep(40000);
+// }
+// _AppPipeController.stop();
+// _AppPipeController.wait();
DBG("finish file");
// }
// }
--
Gitblit v1.8.0