frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

The SVDRP command GRAB now determines the image type from the extension of the given file name

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-12-29 12:18:27 +01:00
parent aa64d64d90
commit 5f7df33b1c
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -4008,3 +4008,7 @@ Video Disk Recorder Revision History
- Dropped the unused "stop recording on primary interface" stuff. - Dropped the unused "stop recording on primary interface" stuff.
- Converting a grabbed image to JPEG is now done with the new function - Converting a grabbed image to JPEG is now done with the new function
RgbToJpeg() (see tools.h). RgbToJpeg() (see tools.h).
- The SVDRP command GRAB now determines the image type (JPEG or PNM) from the
extension (".jpg", ".jpeg" or ".pnm") of the given file name. The explicit
'jpeg' or 'pnm' parameter is still accepted for backward compatibility, but
has no meaning any more.

39
svdrp.c
View File

@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured * and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection. * graphical interface that sits on top of an SVDRP connection.
* *
* $Id: svdrp.c 1.84 2005/11/27 15:29:28 kls Exp $ * $Id: svdrp.c 1.85 2005/12/29 12:17:27 kls Exp $
*/ */
#include "svdrp.h" #include "svdrp.h"
@ -201,10 +201,12 @@ const char *HelpPages[] = {
" Edit the recording with the given number. Before a recording can be\n" " Edit the recording with the given number. Before a recording can be\n"
" edited, an LSTR command must have been executed in order to retrieve\n" " edited, an LSTR command must have been executed in order to retrieve\n"
" the recording numbers.", " the recording numbers.",
"GRAB <filename> [ jpeg | pnm [ <quality> [ <sizex> <sizey> ] ] ]\n" "GRAB <filename> [ <quality> [ <sizex> <sizey> ] ]\n"
" Grab the current frame and save it to the given file. Images can\n" " Grab the current frame and save it to the given file. Images can\n"
" be stored as JPEG (default) or PNM, at the given quality (default\n" " be stored as JPEG or PNM, depending on the given file name extension.\n"
" is 'maximum', only applies to JPEG) and size (default is full screen).", " The quality of the grabbed image (only applies to JPEG) can be in the\n"
" range 0..100, where 100 means \"best\". The size parameters define the\n"
" size of the resulting image (default is full screen).",
"HELP [ <topic> ]\n" "HELP [ <topic> ]\n"
" The HELP command gives help info.", " The HELP command gives help info.",
"HITK [ <key> ]\n" "HITK [ <key> ]\n"
@ -656,22 +658,33 @@ void cSVDRP::CmdGRAB(const char *Option)
const char *delim = " \t"; const char *delim = " \t";
char *strtok_next; char *strtok_next;
FileName = strtok_r(p, delim, &strtok_next); FileName = strtok_r(p, delim, &strtok_next);
if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) { char *Extension = strrchr(FileName, '.');
if (strcasecmp(p, "JPEG") == 0) if (Extension) {
if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
Jpeg = true; Jpeg = true;
else if (strcasecmp(p, "PNM") == 0) else if (strcasecmp(Extension, ".pnm") == 0)
Jpeg = false; Jpeg = false;
else { else {
Reply(501, "Unknown image type \"%s\"", p); Reply(501, "Unknown image type \"%s\"", Extension + 1);
return; return;
} }
} }
else {
Reply(501, "Missing filename extension in \"%s\"", FileName);
return;
}
if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) { if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
if (isnumber(p)) if (strcasecmp(p, "JPEG") == 0 || strcasecmp(p, "PNM") == 0) {
Quality = atoi(p); // tolerate for backward compatibility
else { p = strtok_r(NULL, delim, &strtok_next);
Reply(501, "Illegal quality \"%s\"", p); }
return; if (p) {
if (isnumber(p))
Quality = atoi(p);
else {
Reply(501, "Illegal quality \"%s\"", p);
return;
}
} }
} }
if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) { if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {