diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | skinlcars.c | 6 | ||||
| -rw-r--r-- | skinsttng.c | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 19da89bc..f674c496 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2147,6 +2147,7 @@ Marko Mäkelä <marko.makela@hut.fi> for fixing missing ',' in the Italian and Polish OSD texts for pointing out that "Menu button closes" should actually be "Menu key closes" for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel + for suggesting to simplify some conditional expressions in skinlcars.c and skinsttng.c Patrick Rother <krd-vdr@gulu.net> for reporting a bug in defining timers that only differ in the day of week @@ -8061,3 +8061,5 @@ Video Disk Recorder Revision History - Updated the Italian OSD texts (thanks to Diego Pierotto). - Fixed a missing initialization in the c'tor of cSkinLCARSDisplayChannel (thanks to Marko Mäkelä). +- Simplified some conditional expressions in skinlcars.c and skinsttng.c (suggested + by Marko Mäkelä). diff --git a/skinlcars.c b/skinlcars.c index 2cebb157..dc1afe6d 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 3.4 2013/11/15 15:21:00 kls Exp $ + * $Id: skinlcars.c 3.5 2013/11/15 15:33:00 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -492,7 +492,7 @@ void cSkinLCARSDisplayChannel::DrawTrack(void) { cDevice *Device = cDevice::PrimaryDevice(); const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack()); - if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) { + if (Track ? strcmp(lastTrackId.description, Track->description) : *lastTrackId.description) { osd->DrawText(xc03, yc07, Track ? Track->description : "", Theme.Color(clrTrackName), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xc07 - xc03); strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description)); } @@ -1849,7 +1849,7 @@ void cSkinLCARSDisplayReplay::DrawTrack(void) { cDevice *Device = cDevice::PrimaryDevice(); const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack()); - if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) { + if (Track ? strcmp(lastTrackId.description, Track->description) : *lastTrackId.description) { osd->DrawText(xp03, yp04, Track ? Track->description : "", Theme.Color(clrTrackName), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xp07 - xp03); strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description)); } diff --git a/skinsttng.c b/skinsttng.c index 39a831a8..7e450fda 100644 --- a/skinsttng.c +++ b/skinsttng.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinsttng.c 2.17 2013/03/03 15:29:28 kls Exp $ + * $Id: skinsttng.c 3.1 2013/11/15 15:33:14 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures @@ -338,7 +338,7 @@ void cSkinSTTNGDisplayChannel::Flush(void) } cDevice *Device = cDevice::PrimaryDevice(); const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack()); - if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) { + if (Track ? strcmp(lastTrackId.description, Track->description) : *lastTrackId.description) { osd->DrawText(x3 + TextFrame, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 2 * TextFrame); strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description)); } |