summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2004-11-14 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2004-11-14 18:00:00 +0100
commit23ed5a5ed3824b01cbf66699ff0b34f72ddb9826 (patch)
tree6b645985ef629f81442e7b15089f6f725d2d70e0 /channels.c
parent3038be2a6a849e726d6fe99236d5dc61b679198f (diff)
downloadvdr-patch-lnbsharing-23ed5a5ed3824b01cbf66699ff0b34f72ddb9826.tar.gz
vdr-patch-lnbsharing-23ed5a5ed3824b01cbf66699ff0b34f72ddb9826.tar.bz2
Version 1.3.16vdr-1.3.16
- Fixed cChannel::SetName() in case only the ShortName or Provider has changed (thanks to Sascha Volkenandt for reporting this one). - Added Danish language texts (thanks to Mogens Elneff). - Reactivated the NPTL check at startup because there appear to be still unsolved problems when running on NPTL systems. - Added missing calls to cStatus::MsgOsdClear() in cSkins::Message() (thanks to Joachim Wilke for reporting this one, and Andreas Regel for additional input). - Fixed the cDvbSpuDecoder (thanks to Marco Schlüßler). - Fixed handling of pmAudioOnlyBlack (thanks to Stefan Huelswitt). - Fixed a short glitch when starting a recording on the primary device while in replay or transfer mode (thanks to Marco Schlüßler). - Added missing initialization of cEvent::seen. - Checking PID language codes for ISO 639 compliance to avoid problems with funny characters. Invalid language codes will be stored as "???". - The '0' key now toggles the "Day" item in the "Timers" menu between "single shot" and "repeating". The keys '1'...'7' can be used to toggle the individual days ('1' is Monday). Thanks to Sascha Klek for reporting a problem with the '0' key in the "Day" item of the "Timers" menu.
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/channels.c b/channels.c
index 57986e3..5d500ec 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 1.30 2004/10/31 12:54:06 kls Exp $
+ * $Id: channels.c 1.31 2004/11/02 18:07:05 kls Exp $
*/
#include "channels.h"
@@ -358,15 +358,23 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
void cChannel::SetName(const char *Name, const char *ShortName, const char *Provider)
{
- if (!isempty(Name) && strcmp(name, Name) != 0) {
- if (Number()) {
- dsyslog("changing name of channel %d from '%s,%s;%s' to '%s,%s;%s'", Number(), name, shortName, provider, Name, ShortName, Provider);
- modification |= CHANNELMOD_NAME;
- Channels.SetModified();
+ if (!isempty(Name)) {
+ bool nn = strcmp(name, Name) != 0;
+ bool ns = strcmp(shortName, ShortName) != 0;
+ bool np = strcmp(provider, Provider) != 0;
+ if (nn || ns || np) {
+ if (Number()) {
+ dsyslog("changing name of channel %d from '%s,%s;%s' to '%s,%s;%s'", Number(), name, shortName, provider, Name, ShortName, Provider);
+ modification |= CHANNELMOD_NAME;
+ Channels.SetModified();
+ }
+ if (nn)
+ name = strcpyrealloc(name, Name);
+ if (ns)
+ shortName = strcpyrealloc(shortName, ShortName);
+ if (np)
+ provider = strcpyrealloc(provider, Provider);
}
- name = strcpyrealloc(name, Name);
- shortName = strcpyrealloc(shortName, ShortName);
- provider = strcpyrealloc(provider, Provider);
}
}