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 LSTC can now list the channels with channel ids; channel number 0 lists the data of the current channel

Browse Source
This commit is contained in:
Klaus Schmidinger 2017-04-22 15:02:56 +02:00
parent 9cd28b2ded
commit 467829af32
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3390,6 +3390,7 @@ Dietmar Spingler <d_spingler@gmx.de>
for suggesting to cache the channel/CAM relations in the file 'cam.data' for suggesting to cache the channel/CAM relations in the file 'cam.data'
for suggesting to log signal statistics whenever the tuner of a cDvbDevice acquires for suggesting to log signal statistics whenever the tuner of a cDvbDevice acquires
a lock, and DVB API 5 signal statistics are available a lock, and DVB API 5 signal statistics are available
for suggesting to optionally list the channels with channel ids in the SVDRP command LSTC
Stefan Schallenberg <infos@nafets.de> Stefan Schallenberg <infos@nafets.de>
for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement() for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()

6
HISTORY
View File

@ -8925,7 +8925,7 @@ Video Disk Recorder Revision History
- Now stopping any ongoing recordings before stopping the plugins, to avoid - Now stopping any ongoing recordings before stopping the plugins, to avoid
a crash when stopping VDR while recording. a crash when stopping VDR while recording.
2017-04-20: Version 2.3.4 2017-04-22: Version 2.3.4
- The functionality of HandleRemoteModifications(), which synchronizes changes to - The functionality of HandleRemoteModifications(), which synchronizes changes to
timers between peer VDR machines, has been moved to timers.[ch] and renamed to timers between peer VDR machines, has been moved to timers.[ch] and renamed to
@ -8985,3 +8985,7 @@ Video Disk Recorder Revision History
- Fixed editing a remote timer immediately after it has been created. - Fixed editing a remote timer immediately after it has been created.
- Fixed handling the uncorrected block counter for DVB API 3 devices when calculating - Fixed handling the uncorrected block counter for DVB API 3 devices when calculating
signal quality. signal quality.
- The SVDRP command LSTC can now list the channels with channel ids if the option
':ids' is given (suggested by Dietmar Spingler).
- If 0 is given as the channel number in the SVDRP command LSTC, the data of the
current channel is listed.

40
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 4.16 2017/04/04 11:09:14 kls Exp $ * $Id: svdrp.c 4.17 2017/04/22 11:57:31 kls Exp $
*/ */
#include "svdrp.h" #include "svdrp.h"
@ -754,12 +754,14 @@ const char *HelpPages[] = {
" valid key names is given. If more than one key is given, they are\n" " 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" " entered into the remote control queue in the given sequence. There\n"
" can be up to 31 keys.", " can be up to 31 keys.",
"LSTC [ :groups | <number> | <name> | <id> ]\n" "LSTC [ :ids ] [ :groups | <number> | <name> | <id> ]\n"
" List channels. Without option, all channels are listed. Otherwise\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" " 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" " containing the given string as part of their name are listed.\n"
" If ':groups' is given, all channels are listed including group\n" " If ':groups' is given, all channels are listed including group\n"
" separators. The channel number of a group separator is always 0.", " separators. The channel number of a group separator is always 0.\n"
" With ':ids' the channel ids are listed following the channel numbers.\n"
" The special number 0 can be given to list the current channel.",
"LSTE [ <channel> ] [ now | next | at <time> ]\n" "LSTE [ <channel> ] [ now | next | at <time> ]\n"
" List EPG data. Without any parameters all data of all channels is\n" " List EPG data. Without any parameters all data of all channels is\n"
" listed. If a channel is given (either by number or by channel ID),\n" " listed. If a channel is given (either by number or by channel ID),\n"
@ -1564,11 +1566,17 @@ void cSVDRPServer::CmdHITK(const char *Option)
void cSVDRPServer::CmdLSTC(const char *Option) void cSVDRPServer::CmdLSTC(const char *Option)
{ {
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
bool WithChannelIds = startswith(Option, ":ids") && (Option[4] == ' ' || Option[4] == 0);
if (WithChannelIds)
Option = skipspace(Option + 4);
bool WithGroupSeps = strcasecmp(Option, ":groups") == 0; bool WithGroupSeps = strcasecmp(Option, ":groups") == 0;
if (*Option && !WithGroupSeps) { if (*Option && !WithGroupSeps) {
if (isnumber(Option)) { if (isnumber(Option)) {
if (const cChannel *Channel = Channels->GetByNumber(strtol(Option, NULL, 10))) int n = strtol(Option, NULL, 10);
Reply(250, "%d %s", Channel->Number(), *Channel->ToText()); if (n == 0)
n = cDevice::CurrentChannel();
if (const cChannel *Channel = Channels->GetByNumber(n))
Reply(250, "%d%s%s %s", Channel->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Channel->GetChannelID().ToString() : "", *Channel->ToText());
else else
Reply(501, "Channel \"%s\" not defined", Option); Reply(501, "Channel \"%s\" not defined", Option);
} }
@ -1576,17 +1584,17 @@ void cSVDRPServer::CmdLSTC(const char *Option)
const cChannel *Next = Channels->GetByChannelID(tChannelID::FromString(Option)); const cChannel *Next = Channels->GetByChannelID(tChannelID::FromString(Option));
if (!Next) { if (!Next) {
for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) { for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
if (!Channel->GroupSep()) { if (!Channel->GroupSep()) {
if (strcasestr(Channel->Name(), Option)) { if (strcasestr(Channel->Name(), Option)) {
if (Next) if (Next)
Reply(-250, "%d %s", Next->Number(), *Next->ToText()); Reply(-250, "%d%s%s %s", Next->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Next->GetChannelID().ToString() : "", *Next->ToText());
Next = Channel; Next = Channel;
} }
} }
} }
} }
if (Next) if (Next)
Reply(250, "%d %s", Next->Number(), *Next->ToText()); Reply(250, "%d%s%s %s", Next->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Next->GetChannelID().ToString() : "", *Next->ToText());
else else
Reply(501, "Channel \"%s\" not defined", Option); Reply(501, "Channel \"%s\" not defined", Option);
} }
@ -1594,9 +1602,9 @@ void cSVDRPServer::CmdLSTC(const char *Option)
else if (cChannels::MaxNumber() >= 1) { else if (cChannels::MaxNumber() >= 1) {
for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) { for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
if (WithGroupSeps) if (WithGroupSeps)
Reply(Channel->Next() ? -250: 250, "%d %s", Channel->GroupSep() ? 0 : Channel->Number(), *Channel->ToText()); Reply(Channel->Next() ? -250: 250, "%d%s%s %s", Channel->GroupSep() ? 0 : Channel->Number(), (WithChannelIds && !Channel->GroupSep()) ? " " : "", (WithChannelIds && !Channel->GroupSep()) ? *Channel->GetChannelID().ToString() : "", *Channel->ToText());
else if (!Channel->GroupSep()) else if (!Channel->GroupSep())
Reply(Channel->Number() < cChannels::MaxNumber() ? -250 : 250, "%d %s", Channel->Number(), *Channel->ToText()); Reply(Channel->Number() < cChannels::MaxNumber() ? -250 : 250, "%d%s%s %s", Channel->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Channel->GetChannelID().ToString() : "", *Channel->ToText());
} }
} }
else else