mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-15 12:30:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_warnings' into multi-server

Browse Source 
Conflicts:
	src/zm_monitor.cpp
This commit is contained in:
Isaac Connor
2015-10-02 15:34:05 +00:00
parent 00ef849908 8125ef0334
commit 6ff4e333b4
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_monitor.cpp
View File

@@ -2085,15 +2085,13 @@ Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
const char *device = dbrow[col]; col++;
int channel = atoi(dbrow[col]); col++;
int format = atoi(dbrow[col]); col++;
bool v4l_multi_buffer;
bool v4l_multi_buffer = config.v4l_multi_buffer;
if ( dbrow[col] ) {
if (*dbrow[col] == '0' ) {
v4l_multi_buffer = false;
} else if ( *dbrow[col] == '1' ) {
v4l_multi_buffer = true;
}
} else {
v4l_multi_buffer = config.v4l_multi_buffer;
}
col++;
@@ -2727,15 +2725,13 @@ Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
int channel = atoi(dbrow[col]); col++;
int format = atoi(dbrow[col]); col++;
bool v4l_multi_buffer;
bool v4l_multi_buffer = config.v4l_multi_buffer;
if ( dbrow[col] ) {
if (*dbrow[col] == '0' ) {
v4l_multi_buffer = false;
} else if ( *dbrow[col] == '1' ) {
v4l_multi_buffer = true;
}
} else {
v4l_multi_buffer = config.v4l_multi_buffer;
}
col++;