frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

The SVDRP command LSTC now also accepts channel IDs

This commit is contained in:
Klaus Schmidinger 2011-09-11 14:49:33 +02:00
parent 56bdd34c07
commit 7d637b588f
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -2778,3 +2778,6 @@ Frank Niederwipper <f.niederwipper@gmail.com>
Chris Mayo <aklhfex@gmail.com>
for reporting a problem with detecting frames on radio channels
Dominic Evans <oldmanuk@gmail.com>
for making the SVDRP command LSTC accepts channel IDs

1
HISTORY
View File

@ -6756,3 +6756,4 @@ Video Disk Recorder Revision History
- The 'U' parameter in the diseqc.conf file has been changed to 'S' ("Scr").
- The configuration file name has been changed from "unicable.conf" to "scr.conf".
- Updated sources.conf (thanks to Arthur Konovalov).
- The SVDRP command LSTC now also accepts channel IDs (thanks to Dominic Evans).

26
svdrp.c
View File

@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
* $Id: svdrp.c 2.10 2011/08/27 10:43:18 kls Exp $
* $Id: svdrp.c 2.11 2011/09/11 14:47:22 kls Exp $
*/
#include "svdrp.h"
@ -224,7 +224,7 @@ const char *HelpPages[] = {
" valid key names is given. If more than one key is given, they are\n"
" entered into the remote control queue in the given sequence. There\n"
" can be up to 31 keys.",
"LSTC [ :groups | <number> | <name> ]\n"
"LSTC [ :groups | <number> | <name> | <id> ]\n"
" List channels. Without option, all channels are listed. Otherwise\n"
" only the given channel is listed. If a name is given, all channels\n"
" containing the given string as part of their name are listed.\n"
@ -948,16 +948,18 @@ void cSVDRP::CmdLSTC(const char *Option)
Reply(501, "Channel \"%s\" not defined", Option);
}
else {
cChannel *next = NULL;
for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
if (!channel->GroupSep()) {
if (strcasestr(channel->Name(), Option)) {
if (next)
Reply(-250, "%d %s", next->Number(), *next->ToText());
next = channel;
}
}
}
cChannel *next = Channels.GetByChannelID(tChannelID::FromString(Option));
if (!next) {
for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
if (!channel->GroupSep()) {
if (strcasestr(channel->Name(), Option)) {
if (next)
Reply(-250, "%d %s", next->Number(), *next->ToText());
next = channel;
}
}
}
}
if (next)
Reply(250, "%d %s", next->Number(), *next->ToText());
else