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

Implemented handling the "Parental Rating Descriptor"

Browse Source
This commit is contained in:
Klaus Schmidinger 2010-01-03 14:28:33 +01:00
parent 56627cd12d
commit fc3b402d43
35 changed files with 202 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1088,6 +1088,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for fixing compiler warnings "format not a string literal and no format arguments" for fixing compiler warnings "format not a string literal and no format arguments"
in some syslog calls in some syslog calls
for a patch that was used to implement handling the "component descriptor" ("genre") for a patch that was used to implement handling the "component descriptor" ("genre")
for a patch that was used to implement handling the "parental rating descriptor"
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

6
HISTORY
View File

@ -6260,3 +6260,9 @@ Video Disk Recorder Revision History
Ahrenberg). The 'classic', 'sttng' and 'curses' skins display the textual Ahrenberg). The 'classic', 'sttng' and 'curses' skins display the textual
representation of the content descriptors as "genre". The epg.data file stores representation of the content descriptors as "genre". The epg.data file stores
the genre using the tag character 'G'. the genre using the tag character 'G'.
- Implemented handling the "Parental Rating Descriptor" (based on a patch from Rolf
Ahrenberg). The 'classic', 'sttng' and 'curses' skins display the parental
rating (if given) in their event displays. The epg.data file stores
the parental rating using the tag character 'R'.
IMPORTANT NOTE: if VDR doesn't display a parental rating, this does not
necessarily mean that the given programme is suitable for all audiences!

1
PLUGINS/src/skincurses/HISTORY
View File

@ -83,3 +83,4 @@ VDR Plugin 'skincurses' Revision History
2010-01-03: Version 0.1.8 2010-01-03: Version 0.1.8
- Displaying "genre" in event descriptions. - Displaying "genre" in event descriptions.
- Displaying "parental rating" in event descriptions.

6
PLUGINS/src/skincurses/skincurses.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: skincurses.c 2.1 2010/01/03 11:05:44 kls Exp $ * $Id: skincurses.c 2.2 2010/01/03 14:08:04 kls Exp $
*/ */
#include <ncurses.h> #include <ncurses.h>
@ -402,6 +402,10 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font); osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
} }
y += ts.Height(); y += ts.Height();
if (Event->ParentalRating()) {
cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
}
y += 1; y += 1;
ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Event->Title(), &Font, clrCyan, clrBackground); ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Event->Title(), &Font, clrCyan, clrBackground);
y += ts.Height(); y += ts.Height();

23
eit.c
View File

@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>. * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
* *
* $Id: eit.c 2.8 2010/01/03 11:18:56 kls Exp $ * $Id: eit.c 2.9 2010/01/03 13:39:48 kls Exp $
*/ */
#include "eit.h" #include "eit.h"
@ -167,7 +167,26 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
pEvent->SetContents(Contents); pEvent->SetContents(Contents);
} }
break; break;
case SI::ParentalRatingDescriptorTag: case SI::ParentalRatingDescriptorTag: {
int LanguagePreferenceRating = -1;
SI::ParentalRatingDescriptor *prd = (SI::ParentalRatingDescriptor *)d;
SI::ParentalRatingDescriptor::Rating Rating;
for (SI::Loop::Iterator it3; prd->ratingLoop.getNext(Rating, it3); ) {
if (I18nIsPreferredLanguage(Setup.EPGLanguages, Rating.languageCode, LanguagePreferenceRating)) {
int ParentalRating = (Rating.getRating() & 0xFF);
switch (ParentalRating) {
// values defined by the DVB standard (minimum age = rating + 3 years):
case 0x01 ... 0x0F: ParentalRating += 3; break;
// values defined by broadcaster CSAT (now why didn't they just use 0x07, 0x09 and 0x0D?):
case 0x11: ParentalRating = 10; break;
case 0x12: ParentalRating = 12; break;
case 0x13: ParentalRating = 16; break;
default: ParentalRating = 0;
}
pEvent->SetParentalRating(ParentalRating);
}
}
}
break; break;
case SI::PDCDescriptorTag: { case SI::PDCDescriptorTag: {
SI::PDCDescriptor *pd = (SI::PDCDescriptor *)d; SI::PDCDescriptor *pd = (SI::PDCDescriptor *)d;

19
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $Id: epg.c 2.3 2010/01/03 11:28:38 kls Exp $ * $Id: epg.c 2.4 2010/01/03 14:10:20 kls Exp $
*/ */
#include "epg.h" #include "epg.h"
@ -113,6 +113,7 @@ cEvent::cEvent(tEventID EventID)
description = NULL; description = NULL;
components = NULL; components = NULL;
memset(contents, 0, sizeof(contents)); memset(contents, 0, sizeof(contents));
parentalRating = 0;
startTime = 0; startTime = 0;
duration = 0; duration = 0;
vps = 0; vps = 0;
@ -193,6 +194,11 @@ void cEvent::SetContents(uchar *Contents)
contents[i] = Contents[i]; contents[i] = Contents[i];
} }
void cEvent::SetParentalRating(int ParentalRating)
{
parentalRating = ParentalRating;
}
void cEvent::SetStartTime(time_t StartTime) void cEvent::SetStartTime(time_t StartTime)
{ {
if (startTime != StartTime) { if (startTime != StartTime) {
@ -383,6 +389,13 @@ const char *cEvent::ContentToString(uchar Content)
return ""; return "";
} }
cString cEvent::GetParentalRatingString(void) const
{
if (parentalRating)
return cString::sprintf(tr("ParentalRating$from %d"), parentalRating);
return NULL;
}
cString cEvent::GetDateString(void) const cString cEvent::GetDateString(void) const
{ {
return DateString(startTime); return DateString(startTime);
@ -425,6 +438,8 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
fprintf(f, " %02X", Contents(i)); fprintf(f, " %02X", Contents(i));
fprintf(f, "\n"); fprintf(f, "\n");
} }
if (parentalRating)
fprintf(f, "%sR %d\n", Prefix, parentalRating);
if (components) { if (components) {
for (int i = 0; i < components->NumComponents(); i++) { for (int i = 0; i < components->NumComponents(); i++) {
tComponent *p = components->Component(i); tComponent *p = components->Component(i);
@ -465,6 +480,8 @@ bool cEvent::Parse(char *s)
} }
} }
break; break;
case 'R': SetParentalRating(atoi(t));
break;
case 'X': if (!components) case 'X': if (!components)
components = new cComponents; components = new cComponents;
components->SetComponent(components->NumComponents(), t); components->SetComponent(components->NumComponents(), t);

6
epg.h
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $Id: epg.h 2.1 2010/01/03 11:17:20 kls Exp $ * $Id: epg.h 2.2 2010/01/03 14:01:55 kls Exp $
*/ */
#ifndef __EPG_H #ifndef __EPG_H
@ -77,6 +77,7 @@ private:
char *description; // Description of this event char *description; // Description of this event
cComponents *components; // The stream components of this event cComponents *components; // The stream components of this event
uchar contents[MAXEVCONTENTS]; // Contents of this event uchar contents[MAXEVCONTENTS]; // Contents of this event
int parentalRating; // Parental rating of this event
time_t startTime; // Start time of this event time_t startTime; // Start time of this event
int duration; // Duration of this event in seconds int duration; // Duration of this event in seconds
time_t vps; // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL) time_t vps; // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
@ -96,6 +97,7 @@ public:
const char *Description(void) const { return description; } const char *Description(void) const { return description; }
const cComponents *Components(void) const { return components; } const cComponents *Components(void) const { return components; }
uchar Contents(int i = 0) const { return (0 <= i && i < MAXEVCONTENTS) ? contents[i] : 0; } uchar Contents(int i = 0) const { return (0 <= i && i < MAXEVCONTENTS) ? contents[i] : 0; }
int ParentalRating(void) const { return parentalRating; }
time_t StartTime(void) const { return startTime; } time_t StartTime(void) const { return startTime; }
time_t EndTime(void) const { return startTime + duration; } time_t EndTime(void) const { return startTime + duration; }
int Duration(void) const { return duration; } int Duration(void) const { return duration; }
@ -105,6 +107,7 @@ public:
bool HasTimer(void) const; bool HasTimer(void) const;
bool IsRunning(bool OrAboutToStart = false) const; bool IsRunning(bool OrAboutToStart = false) const;
static const char *ContentToString(uchar Content); static const char *ContentToString(uchar Content);
cString GetParentalRatingString(void) const;
cString GetDateString(void) const; cString GetDateString(void) const;
cString GetTimeString(void) const; cString GetTimeString(void) const;
cString GetEndTimeString(void) const; cString GetEndTimeString(void) const;
@ -118,6 +121,7 @@ public:
void SetDescription(const char *Description); void SetDescription(const char *Description);
void SetComponents(cComponents *Components); // Will take ownership of Components! void SetComponents(cComponents *Components); // Will take ownership of Components!
void SetContents(uchar *Contents); void SetContents(uchar *Contents);
void SetParentalRating(int ParentalRating);
void SetStartTime(time_t StartTime); void SetStartTime(time_t StartTime);
void SetDuration(int Duration); void SetDuration(int Duration);
void SetVps(time_t Vps); void SetVps(time_t Vps);

6
po/ca_ES.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalanian\n" "Language-Team: Catalanian\n"
@ -279,6 +279,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Sense títol" msgstr "Sense títol"

6
po/cs_CZ.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-02-28 15:00+0200\n" "PO-Revision-Date: 2008-02-28 15:00+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>, Jiøí Dobrý <jdobry@centrum.cz>\n" "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>, Jiøí Dobrý <jdobry@centrum.cz>\n"
"Language-Team: Czech\n" "Language-Team: Czech\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Bez názvu" msgstr "Bez názvu"

6
po/da_DK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish\n" "Language-Team: Danish\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Ingen titel" msgstr "Ingen titel"

6
po/de_DE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-11-25 15:19+0200\n" "PO-Revision-Date: 2007-11-25 15:19+0200\n"
"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n" "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -276,6 +276,10 @@ msgstr "Unver
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "Live-Sendung" msgstr "Live-Sendung"
#, c-format
msgid "ParentalRating$from %d"
msgstr "ab %d"
msgid "No title" msgid "No title"
msgstr "Kein Titel" msgstr "Kein Titel"

6
po/el_GR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek\n" "Language-Team: Greek\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "×ùñßò Ôßôëï" msgstr "×ùñßò Ôßôëï"

6
po/es_ES.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Sin título" msgstr "Sin título"

6
po/et_EE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian\n" "Language-Team: Estonian\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Pealkiri puudub" msgstr "Pealkiri puudub"

6
po/fi_FI.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: Finnish\n" "Language-Team: Finnish\n"
@ -279,6 +279,10 @@ msgstr "Julkaisematon"
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "Suoralähetys" msgstr "Suoralähetys"
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Ei esitystä" msgstr "Ei esitystä"

6
po/fr_FR.po
View File

@ -13,7 +13,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-02-27 18:14+0100\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n"
"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n" "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -282,6 +282,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Sans titre" msgstr "Sans titre"

6
po/hr_HR.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n" "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian\n" "Language-Team: Croatian\n"
@ -278,6 +278,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Bez naziva" msgstr "Bez naziva"

6
po/hu_HU.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-12-01 21:42+0200\n" "PO-Revision-Date: 2007-12-01 21:42+0200\n"
"Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian\n" "Language-Team: Hungarian\n"
@ -279,6 +279,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "név nélkül" msgstr "név nélkül"

6
po/it_IT.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2009-11-28 22:50+0100\n" "PO-Revision-Date: 2009-11-28 22:50+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -283,6 +283,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Senza titolo" msgstr "Senza titolo"

6
po/lt_LT.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.9\n" "Project-Id-Version: VDR 1.7.9\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2009-10-17 14:19+0200\n" "PO-Revision-Date: 2009-10-17 14:19+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian\n" "Language-Team: Lithuanian\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Be pavadinimo" msgstr "Be pavadinimo"

6
po/nl_NL.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n"
"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n" "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
"Language-Team: Dutch\n" "Language-Team: Dutch\n"
@ -280,6 +280,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Geen titel" msgstr "Geen titel"

6
po/nn_NO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian\n" "Language-Team: Norwegian\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "" msgstr ""

6
po/pl_PL.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: Polish\n" "Language-Team: Polish\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Bez tytu³u" msgstr "Bez tytu³u"

6
po/pt_PT.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-03-18 17:04+0100\n" "PO-Revision-Date: 2008-03-18 17:04+0100\n"
"Last-Translator: anonymous\n" "Last-Translator: anonymous\n"
"Language-Team: Portuguese\n" "Language-Team: Portuguese\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Sem título" msgstr "Sem título"

6
po/ro_RO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-02-25 00:39+0100\n" "PO-Revision-Date: 2008-02-25 00:39+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian\n" "Language-Team: Romanian\n"
@ -279,6 +279,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Fãrã titlu" msgstr "Fãrã titlu"

6
po/ru_RU.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-12-15 14:37+0100\n" "PO-Revision-Date: 2008-12-15 14:37+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: Russian\n" "Language-Team: Russian\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "±Õ× ÝÐ×ÒÐÝØï" msgstr "±Õ× ÝÐ×ÒÐÝØï"

6
po/sk_SK.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2009-09-30 12:50+0100\n" "PO-Revision-Date: 2009-09-30 12:50+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak\n" "Language-Team: Slovak\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Bez názvu" msgstr "Bez názvu"

6
po/sl_SI.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-02-28 19:44+0100\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian\n" "Language-Team: Slovenian\n"
@ -277,6 +277,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Brez naziva" msgstr "Brez naziva"

6
po/sv_SE.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-03-12 18:25+0100\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n"
"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n" "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
"Language-Team: Swedish\n" "Language-Team: Swedish\n"
@ -279,6 +279,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "ingen titel" msgstr "ingen titel"

6
po/tr_TR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish\n" "Language-Team: Turkish\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Ýsim yok" msgstr "Ýsim yok"

6
po/uk_UA.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.7\n" "Project-Id-Version: VDR 1.7.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2009-05-31 13:17+0200\n" "PO-Revision-Date: 2009-05-31 13:17+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian\n" "Language-Team: Ukrainian\n"
@ -276,6 +276,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "Без назви" msgstr "Без назви"

6
po/zh_CN.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2010-01-03 12:41+0100\n" "POT-Creation-Date: 2010-01-03 15:10+0100\n"
"PO-Revision-Date: 2009-09-23 23:50+0800\n" "PO-Revision-Date: 2009-09-23 23:50+0800\n"
"Last-Translator: Nan Feng <nfgx@21cn.com>\n" "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
"Language-Team: Chinese\n" "Language-Team: Chinese\n"
@ -279,6 +279,10 @@ msgstr ""
msgid "Content$Live Broadcast" msgid "Content$Live Broadcast"
msgstr "" msgstr ""
#, c-format
msgid "ParentalRating$from %d"
msgstr ""
msgid "No title" msgid "No title"
msgstr "没有标题" msgstr "没有标题"

8
skinclassic.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: skinclassic.c 2.1 2010/01/03 11:28:24 kls Exp $ * $Id: skinclassic.c 2.2 2010/01/03 14:08:17 kls Exp $
*/ */
#include "skinclassic.h" #include "skinclassic.h"
@ -345,6 +345,12 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w); osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
} }
y += ts.Height(); y += ts.Height();
if (Event->ParentalRating()) {
cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
const cFont *font = cFont::GetFont(fontSml);
int w = font->Width(buffer);
osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
}
y += font->Height(); y += font->Height();
ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground)); ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
y += ts.Height(); y += ts.Height();

11
skinsttng.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: skinsttng.c 2.2 2010/01/03 10:46:09 kls Exp $ * $Id: skinsttng.c 2.3 2010/01/03 14:08:11 kls Exp $
*/ */
// Star Trek: The Next Generation® is a registered trademark of Paramount Pictures // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures
@ -593,6 +593,15 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
osd->DrawEllipse (x6, y, x7 - 1, yb - 1, frameColor, 5); osd->DrawEllipse (x6, y, x7 - 1, yb - 1, frameColor, 5);
} }
y += ts.Height(); y += ts.Height();
if (Event->ParentalRating()) {
cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
const cFont *font = cFont::GetFont(fontSml);
int w = font->Width(buffer);
osd->DrawText(x4 - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w);
int yb = y + font->Height();
osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor);
osd->DrawEllipse (x6, y, x7 - 1, yb - 1, frameColor, 5);
}
y += font->Height(); y += font->Height();
ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground)); ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
y += ts.Height(); y += ts.Height();

4
vdr.5
View File

@ -8,7 +8,7 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" vdr distribution.
.\" .\"
.\" $Id: vdr.5 2.10 2010/01/03 11:23:16 kls Exp $ .\" $Id: vdr.5 2.11 2010/01/03 13:37:07 kls Exp $
.\" .\"
.TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files" .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
.SH NAME .SH NAME
@ -696,6 +696,7 @@ l l.
\fBS\fR@<short text> \fBS\fR@<short text>
\fBD\fR@<description> \fBD\fR@<description>
\fBG\fR@<genre> <genre>... \fBG\fR@<genre> <genre>...
\fBR\fR@<parental rating>
\fBX\fR@<stream> <type> <language> <descr> \fBX\fR@<stream> <type> <language> <descr>
\fBV\fR@<vps time> \fBV\fR@<vps time>
\fBe\fR@ \fBe\fR@
@ -726,6 +727,7 @@ l l.
<short text> @is the short text of the event (typically the name of the episode etc.) <short text> @is the short text of the event (typically the name of the episode etc.)
<description> @is the description of the event (any '|' characters will be interpreted as newlines) <description> @is the description of the event (any '|' characters will be interpreted as newlines)
<genre> @is a two digit hex code, as defined in ETSI EN 300 468, table 28 (up to 4 genre codes are supported) <genre> @is a two digit hex code, as defined in ETSI EN 300 468, table 28 (up to 4 genre codes are supported)
<parental rating>@is the minimum age of the intended audience
<stream> @is the stream content (1 = video, 2 = audio, 3 = subtitles, 4 = AC3) <stream> @is the stream content (1 = video, 2 = audio, 3 = subtitles, 4 = AC3)
<type> @is the stream type according to ETSI EN 300 468 <type> @is the stream type according to ETSI EN 300 468
<language> @is the three letter language code (optionally two codes, separated by '+') <language> @is the three letter language code (optionally two codes, separated by '+')