mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-03-06 07:17:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change conf char* to C++ string

Browse Source
This commit is contained in:
MrDave
2019-10-27 18:11:23 -06:00
committed by Mr-Dave
parent fa07d2e1e7
commit 487c4a6a90
27 changed files with 1482 additions and 1795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_loopback.cpp
View File

@@ -227,12 +227,12 @@ void vlp_init(struct ctx_cam *cam){
#if defined(HAVE_V4L2) && !defined(BSD)
/* open video loopback devices if enabled */
if (cam->conf->video_pipe) {
if (cam->conf->video_pipe != "") {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
,_("Opening video loopback device for normal pictures"));
/* vid_startpipe should get the output dimensions */
cam->pipe = vlp_startpipe(cam->conf->video_pipe, cam->imgs.width, cam->imgs.height);
cam->pipe = vlp_startpipe(cam->conf->video_pipe.c_str(), cam->imgs.width, cam->imgs.height);
if (cam->pipe < 0) {
MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO
@@ -243,12 +243,12 @@ void vlp_init(struct ctx_cam *cam){
cam->pipe = -1;
}
if (cam->conf->video_pipe_motion) {
if (cam->conf->video_pipe_motion != "") {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
,_("Opening video loopback device for motion pictures"));
/* vid_startpipe should get the output dimensions */
cam->mpipe = vlp_startpipe(cam->conf->video_pipe_motion, cam->imgs.width, cam->imgs.height);
cam->mpipe = vlp_startpipe(cam->conf->video_pipe_motion.c_str(), cam->imgs.width, cam->imgs.height);
if (cam->mpipe < 0) {
MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO