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

Fixed handling group separators when showing channel names with source; initializing channel names with source when setting transponder data

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-07-14 12:15:00 +02:00
parent 45d261fb74
commit 06761bf157
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: channels.c 2.23 2012/06/17 11:53:10 kls Exp $ * $Id: channels.c 2.24 2012/07/14 12:15:00 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -120,7 +120,7 @@ cChannel& cChannel::operator= (const cChannel &Channel)
const char *cChannel::Name(void) const const char *cChannel::Name(void) const
{ {
if (Setup.ShowChannelNamesWithSource) { if (Setup.ShowChannelNamesWithSource && !groupSep) {
if (isempty(nameSource)) if (isempty(nameSource))
nameSource = cString::sprintf("%s (%c)", name, cSource::ToChar(source)); nameSource = cString::sprintf("%s (%c)", name, cSource::ToChar(source));
return nameSource; return nameSource;
@ -132,7 +132,7 @@ const char *cChannel::ShortName(bool OrName) const
{ {
if (OrName && isempty(shortName)) if (OrName && isempty(shortName))
return Name(); return Name();
if (Setup.ShowChannelNamesWithSource) { if (Setup.ShowChannelNamesWithSource && !groupSep) {
if (isempty(shortNameSource)) if (isempty(shortNameSource))
shortNameSource = cString::sprintf("%s (%c)", shortName, cSource::ToChar(source)); shortNameSource = cString::sprintf("%s (%c)", shortName, cSource::ToChar(source));
return shortNameSource; return shortNameSource;
@ -217,6 +217,8 @@ bool cChannel::SetTransponderData(int Source, int Frequency, int Srate, const ch
srate = Srate; srate = Srate;
parameters = Parameters; parameters = Parameters;
schedule = NULL; schedule = NULL;
nameSource = NULL;
shortNameSource = NULL;
if (Number() && !Quiet) { if (Number() && !Quiet) {
dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString()); dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
modification |= CHANNELMOD_TRANSP; modification |= CHANNELMOD_TRANSP;