ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load User and Pass as well

This commit is contained in:
Isaac Connor 2018-03-13 14:50:41 -04:00
parent fa01dbf6af
commit cefd00d1ea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -69,7 +69,7 @@ std::string load_monitor_sql =
"SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, LinkedMonitors, " "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, LinkedMonitors, "
"AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS," "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
"Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
"Protocol, Method, Options, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, " "Protocol, Method, Options, User, Pass, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
"SaveJPEGs, VideoWriter, EncoderParameters, " "SaveJPEGs, VideoWriter, EncoderParameters, "
//" OutputCodec, Encoder, OutputContainer, " //" OutputCodec, Encoder, OutputContainer, "
"RecordAudio, " "RecordAudio, "
@ -1990,7 +1990,7 @@ int Monitor::LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose p
"SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, LinkedMonitors, " "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, LinkedMonitors, "
"AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS," "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
"Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
"Protocol, Method, Options, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, " "Protocol, Method, Options, User, Pass, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
"SaveJPEGs, VideoWriter, EncoderParameters, "SaveJPEGs, VideoWriter, EncoderParameters,
"OutputCodec, Encoder, OutputContainer," "OutputCodec, Encoder, OutputContainer,"
" RecordAudio, " " RecordAudio, "
@ -2043,6 +2043,8 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
std::string protocol = dbrow[col] ? dbrow[col] : ""; col++; std::string protocol = dbrow[col] ? dbrow[col] : ""; col++;
std::string method = dbrow[col] ? dbrow[col] : ""; col++; std::string method = dbrow[col] ? dbrow[col] : ""; col++;
std::string options = dbrow[col] ? dbrow[col] : ""; col++; std::string options = dbrow[col] ? dbrow[col] : ""; col++;
std::string user = dbrow[col] ? dbrow[col] : ""; col++;
std::string pass = dbrow[col] ? dbrow[col] : ""; col++;
std::string host = dbrow[col] ? dbrow[col] : ""; col++; std::string host = dbrow[col] ? dbrow[col] : ""; col++;
std::string port = dbrow[col] ? dbrow[col] : ""; col++; std::string port = dbrow[col] ? dbrow[col] : ""; col++;
std::string path = dbrow[col] ? dbrow[col] : ""; col++; std::string path = dbrow[col] ? dbrow[col] : ""; col++;