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

Merge pull request #1820 from SteveGilvarry/Remove_arg_r 

Remove zmc -r argument as it does not seem to be implemented.
This commit is contained in:
Andrew Bauer 2017-04-15 07:17:56 -05:00 committed by GitHub
parent ab4b5e6b69 e5b18ee213
commit 8c298b96d0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zmc.cpp
View File

@ -27,7 +27,6 @@ zmc - The ZoneMinder Capture daemon
zmc -d <device_path> zmc -d <device_path>
zmc --device <device_path> zmc --device <device_path>
zmc -r <proto> -H <host> -P <port> -p <path>
zmc -f <file_path> zmc -f <file_path>
zmc --file <file_path> zmc --file <file_path>
zmc -m <monitor_id> zmc -m <monitor_id>
@ -45,7 +44,6 @@ possible, this should run at more or less constant speed.
=head1 OPTIONS =head1 OPTIONS
-d, --device <device_path> - For local cameras, device to access. e.g /dev/video0 etc -d, --device <device_path> - For local cameras, device to access. e.g /dev/video0 etc
-r <proto> -H <host> -P <port> -p <path> - For remote cameras
-f, --file <file_path> - For local images, jpg file to access. -f, --file <file_path> - For local images, jpg file to access.
-m, --monitor_id - ID of the monitor to analyse -m, --monitor_id - ID of the monitor to analyse
-h, --help - Display usage information -h, --help - Display usage information
@ -83,7 +81,6 @@ void Usage()
#else #else
fprintf( stderr, " -d, --device <device_path> : For local cameras, device to access. E.g /dev/video0 etc\n" ); fprintf( stderr, " -d, --device <device_path> : For local cameras, device to access. E.g /dev/video0 etc\n" );
#endif #endif
fprintf( stderr, " -r <proto> -H <host> -P <port> -p <path> : For remote cameras\n" );
fprintf( stderr, " -f, --file <file_path> : For local images, jpg file to access.\n" ); fprintf( stderr, " -f, --file <file_path> : For local images, jpg file to access.\n" );
fprintf( stderr, " -m, --monitor <monitor_id> : For sources associated with a single monitor\n" ); fprintf( stderr, " -m, --monitor <monitor_id> : For sources associated with a single monitor\n" );
fprintf( stderr, " -h, --help : This screen\n" ); fprintf( stderr, " -h, --help : This screen\n" );
@ -173,14 +170,14 @@ int main( int argc, char *argv[] )
int modes = ( device[0]?1:0 + host[0]?1:0 + file[0]?1:0 + (monitor_id>0?1:0) ); int modes = ( device[0]?1:0 + host[0]?1:0 + file[0]?1:0 + (monitor_id>0?1:0) );
if ( modes > 1 ) if ( modes > 1 )
{ {
fprintf( stderr, "Only one of device, host/port/path, file or monitor id allowed\n" ); fprintf( stderr, "Only one of device, file or monitor id allowed\n" );
Usage(); Usage();
exit( 0 ); exit( 0 );
} }
if ( modes < 1 ) if ( modes < 1 )
{ {
fprintf( stderr, "One of device, host/port/path, file or monitor id must be specified\n" ); fprintf( stderr, "One of device, file or monitor id must be specified\n" );
Usage(); Usage();
exit( 0 ); exit( 0 );
} }