~chenshijun/c++.git

~chenshijun / c++

派生自 development/c++

概况
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-08 5fa7c97d9544e7afdf781a93e8ffb58dce22c977

 QiaoJiaSystem/DataManagerServer/AppPipeController.cpp

@@ -15,7 +15,7 @@
    }
    videoCaptureElement.registerConnector([&]{
        //if(!videoPublishElement.isBusy()){
            //videoPublishElement.setImage(videoCaptureElement.getImage());
            videoPublishElement.setImage(videoCaptureElement.getImage());
            //videoPublishElement.submit();
        //}

			@@ -15,7 +15,7 @@
			}
			videoCaptureElement.registerConnector([&]{
			//if(!videoPublishElement.isBusy()){
			//videoPublishElement.setImage(videoCaptureElement.getImage());
			videoPublishElement.setImage(videoCaptureElement.getImage());
			//videoPublishElement.submit();
			//}