From 80cb1ec0ef24c49e12b9d6655310f759fdecfc1a Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 18 Feb 2021 13:36:34 +0100 Subject: [PATCH 1/6] Update estuary4vdr Correct position of time --- skins/estuary4vdr/xmlfiles/displaychannel.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/skins/estuary4vdr/xmlfiles/displaychannel.xml b/skins/estuary4vdr/xmlfiles/displaychannel.xml index 3d07379..050218f 100644 --- a/skins/estuary4vdr/xmlfiles/displaychannel.xml +++ b/skins/estuary4vdr/xmlfiles/displaychannel.xml @@ -16,9 +16,12 @@ From e7ea88c253ad9dcf940b690905e0054896968ddc Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 4 Mar 2021 10:59:53 +0100 Subject: [PATCH 2/6] Revert "Disabled timeshift display for non timeshift recordings" This reverts commit 1fc5379e2eed0ecd7eb2227564077a62bc0b1e12. --- coreengine/viewdisplayreplay.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/coreengine/viewdisplayreplay.c b/coreengine/viewdisplayreplay.c index 30986bb..9e77c4d 100644 --- a/coreengine/viewdisplayreplay.c +++ b/coreengine/viewdisplayreplay.c @@ -181,9 +181,6 @@ void cViewReplay::GetGlobalTimers(void) { void cViewReplay::SetTimeShiftValues(int current, int total) { if (!recording) return; - const char *recName = recording->Name(); - if (recName && *recName != '@') - return; timeShiftActive = false; #if APIVERSNUM >= 20101 int usage = recording->IsInUse(); From fdc8195174cc5f108094967fe41656f81d0b3869 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 4 Mar 2021 16:30:10 +0100 Subject: [PATCH 3/6] Add active recordings to timeshift mode If the current program is paused (timeshift mode), a recording is created with an "@" at the beginning. A skin can display this mode differently than the normal playback of a recording. This change also enables a different display mode for currently active timer recordings. --- coreengine/viewdisplayreplay.c | 44 ++++++++------ coreengine/viewdisplayreplay.h | 2 +- coreengine/viewelementsdisplayreplay.c | 60 ++++++++++---------- coreengine/viewelementsdisplayreplay.h | 35 +++++++----- skins/estuary4vdr/xmlfiles/displayreplay.xml | 3 +- skinskeleton/xmlfiles/displayreplay.xml | 55 ++++++++++-------- 6 files changed, 111 insertions(+), 88 deletions(-) diff --git a/coreengine/viewdisplayreplay.c b/coreengine/viewdisplayreplay.c index 9e77c4d..1a84090 100644 --- a/coreengine/viewdisplayreplay.c +++ b/coreengine/viewdisplayreplay.c @@ -154,7 +154,7 @@ void cViewReplay::ClearVariables(void) { lastFlush = 0; lastFlushModeOnly = 0; message = false; - timeShiftActive = false; + timeShiftActive = NoRec; timeShiftFramesTotal = -1; timeShiftLength = -1; timeShiftDuration = ""; @@ -181,35 +181,41 @@ void cViewReplay::GetGlobalTimers(void) { void cViewReplay::SetTimeShiftValues(int current, int total) { if (!recording) return; - timeShiftActive = false; + timeShiftActive = NoRec; #if APIVERSNUM >= 20101 int usage = recording->IsInUse(); if (usage & ruTimer) - timeShiftActive = true; + timeShiftActive = NormalRec; else { GetGlobalTimers(); if (globalTimers.IsRecording(recording)) - timeShiftActive = true; + timeShiftActive = NormalRec; } #endif if (!timeShiftActive) return; + const char *recName = recording->Name(); + if (recName && *recName == '@') + timeShiftActive = TimeshiftRec; const cRecordingInfo *recInfo = recording->Info(); if (!recInfo) return; const cSchedule *Schedule = NULL; - { - LOCK_SCHEDULES_READ; - Schedule = Schedules->GetSchedule(recInfo->ChannelID()); + if (timeShiftActive == TimeshiftRec) { + { + LOCK_SCHEDULES_READ; + Schedule = Schedules->GetSchedule(recInfo->ChannelID()); + } + if (!Schedule) + return; } - if (!Schedule) - return; // Get event at actual recording position - const cEvent *eventEnde = Schedule->GetEventAround(time(0)); - if (!eventEnde) + const cEvent *event = (timeShiftActive == TimeshiftRec) ? Schedule->GetEventAround(time(0)) + : recInfo->GetEvent(); + if (!event) return; // End of live program - time_t liveEventStop = eventEnde->EndTime(); + time_t liveEventStop = event->EndTime(); // Begin of timeshift recording time_t recordingStart = time(0) - recording->LengthInSeconds(); // actual timeshiftlength in sec @@ -218,12 +224,14 @@ void cViewReplay::SetTimeShiftValues(int current, int total) { timeShiftFramesTotal = total * ((double)timeShiftLength / (double)recording->LengthInSeconds()); // Get event at actual replay position (add 30sec for a better match) int timeShiftSecondsAfter = (int)(recording->LengthInSeconds() * (1.0 - (double)current / (double)total)) + 30; - const cEvent *eventReplay = Schedule->GetEventAround(time(0) - timeShiftSecondsAfter); - // Display title at replay position - if (eventReplay && eventReplay != lastEvent && veRecTitle) { - veRecTitle->Set(recording, eventReplay, true); - veRecTitle->Parse(); - lastEvent = eventReplay; + if (timeShiftActive == TimeshiftRec) { + const cEvent *eventReplay = Schedule->GetEventAround(time(0) - timeShiftSecondsAfter); + // Display title at replay position + if (veRecTitle && eventReplay != lastEvent) { + veRecTitle->Set(recording, eventReplay, timeShiftActive); + veRecTitle->Parse(); + lastEvent = eventReplay; + } } int mins = (timeShiftLength / 60) % 60; int hours = (timeShiftLength / 3600) % 24; diff --git a/coreengine/viewdisplayreplay.h b/coreengine/viewdisplayreplay.h index 8e61f3b..f1eec67 100644 --- a/coreengine/viewdisplayreplay.h +++ b/coreengine/viewdisplayreplay.h @@ -29,7 +29,7 @@ private: time_t lastFlushModeOnly; bool message; int reclength; - bool timeShiftActive; + eRecType_t timeShiftActive; int timeShiftFramesTotal; int timeShiftLength; cString timeshiftrest; diff --git a/coreengine/viewelementsdisplayreplay.c b/coreengine/viewelementsdisplayreplay.c index 4116153..2f7b690 100644 --- a/coreengine/viewelementsdisplayreplay.c +++ b/coreengine/viewelementsdisplayreplay.c @@ -10,7 +10,7 @@ cVeDrRecTitle::cVeDrRecTitle(void) { recording = NULL; event = NULL; title = NULL; - timeshiftActive = false; + timeShiftActive = NoRec; } cVeDrRecTitle::~cVeDrRecTitle(void) { @@ -29,8 +29,8 @@ void cVeDrRecTitle::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrRecTitle::Set(const cRecording *recording, const cEvent *event, bool timeshiftActive) { - this->timeshiftActive = timeshiftActive; +void cVeDrRecTitle::Set(const cRecording *recording, const cEvent *event, eRecType_t timeShiftActive) { + this->timeShiftActive = timeShiftActive; if (this->title) { free(this->title); this->title = NULL; @@ -88,7 +88,7 @@ bool cVeDrRecTitle::Parse(bool force) { tokenContainer->AddStringToken((int)eDRRecTitleST::recsubtitle, recShortText); tokenContainer->AddStringToken((int)eDRRecTitleST::recdate, *ShortDateString(recording->Start())); tokenContainer->AddStringToken((int)eDRRecTitleST::rectime, *TimeString(recording->Start())); - tokenContainer->AddIntToken((int)eDRRecTitleIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDRRecTitleIT::timeshift, timeShiftActive); if (event) { tokenContainer->AddStringToken((int)eDRRecTitleST::eventstart, *TimeString(event->StartTime())); tokenContainer->AddStringToken((int)eDRRecTitleST::eventstop, *TimeString(event->EndTime())); @@ -164,7 +164,7 @@ bool cVeDrRecInfo::Parse(bool force) { cVeDrCurrentTime::cVeDrCurrentTime(void) { changed = true; current = NULL; - timeshiftActive = false; + timeShiftActive = NoRec; } cVeDrCurrentTime::~cVeDrCurrentTime(void) { @@ -178,12 +178,12 @@ void cVeDrCurrentTime::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrCurrentTime::Set(const char *current, bool timeshiftActive) { +void cVeDrCurrentTime::Set(const char *current, eRecType_t timeShiftActive) { if (!current) return; free(this->current); this->current = strdup(current); - this->timeshiftActive = timeshiftActive; + this->timeShiftActive = timeShiftActive; changed = true; } @@ -192,7 +192,7 @@ bool cVeDrCurrentTime::Parse(bool force) { return false; tokenContainer->Clear(); tokenContainer->AddStringToken((int)eDRCurrentTimeST::reccurrent, current); - tokenContainer->AddIntToken((int)eDRCurrentTimeIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDRCurrentTimeIT::timeshift, timeShiftActive); SetDirty(); changed = false; return true; @@ -205,7 +205,7 @@ cVeDrTotalTime::cVeDrTotalTime(void) { changed = true; total = NULL; timeshiftDuration = NULL; - timeshiftActive = false; + timeShiftActive = NoRec; } cVeDrTotalTime::~cVeDrTotalTime(void) { @@ -221,12 +221,12 @@ void cVeDrTotalTime::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrTotalTime::Set(const char *total, const char *timeshiftDuration, bool timeshiftActive) { +void cVeDrTotalTime::Set(const char *total, const char *timeshiftDuration, eRecType_t timeShiftActive) { if (!total) return; free(this->total); this->total = strdup(total); - this->timeshiftActive = timeshiftActive; + this->timeShiftActive = timeShiftActive; free(this->timeshiftDuration); this->timeshiftDuration = NULL; if (timeshiftDuration) @@ -240,7 +240,7 @@ bool cVeDrTotalTime::Parse(bool force) { tokenContainer->Clear(); tokenContainer->AddStringToken((int)eDRTotalTimeST::rectotal, total); tokenContainer->AddStringToken((int)eDRTotalTimeST::timeshifttotal, timeshiftDuration); - tokenContainer->AddIntToken((int)eDRTotalTimeIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDRTotalTimeIT::timeshift, timeShiftActive); SetDirty(); changed = false; return true; @@ -254,7 +254,7 @@ cVeDrTimeshiftTimes::cVeDrTimeshiftTimes(void) { start = ""; playbacktime = ""; timeshiftrest = ""; - timeshiftActive = false; + timeShiftActive = NoRec; } cVeDrTimeshiftTimes::~cVeDrTimeshiftTimes(void) { @@ -269,8 +269,8 @@ void cVeDrTimeshiftTimes::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrTimeshiftTimes::Set(cString start, cString playbacktime, cString timeshiftrest, bool timeshiftActive) { - this->timeshiftActive = timeshiftActive; +void cVeDrTimeshiftTimes::Set(cString start, cString playbacktime, cString timeshiftrest, eRecType_t timeShiftActive) { + this->timeShiftActive = timeShiftActive; if (strcmp(*this->start, *start) || strcmp(*this->playbacktime, *playbacktime) || strcmp(*this->timeshiftrest, *timeshiftrest)) { this->start = start; this->playbacktime = playbacktime; @@ -286,7 +286,7 @@ bool cVeDrTimeshiftTimes::Parse(bool force) { tokenContainer->AddStringToken((int)eDRTimeshiftTimesST::recstart, *start); tokenContainer->AddStringToken((int)eDRTimeshiftTimesST::playbacktime, *playbacktime); tokenContainer->AddStringToken((int)eDRTimeshiftTimesST::timeshiftrest, *timeshiftrest); - tokenContainer->AddIntToken((int)eDRTimeshiftTimesIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDRTimeshiftTimesIT::timeshift, timeShiftActive); SetDirty(); changed = false; return true; @@ -298,7 +298,7 @@ bool cVeDrTimeshiftTimes::Parse(bool force) { cVeDrEndTime::cVeDrEndTime(void) { changed = true; end = ""; - timeshiftActive = false; + timeShiftActive = NoRec; } cVeDrEndTime::~cVeDrEndTime(void) { @@ -311,8 +311,8 @@ void cVeDrEndTime::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrEndTime::Set(cString end, bool timeshiftActive) { - this->timeshiftActive = timeshiftActive; +void cVeDrEndTime::Set(cString end, eRecType_t timeShiftActive) { + this->timeShiftActive = timeShiftActive; if (strcmp(*this->end, *end)) { this->end = end; changed = true; @@ -324,7 +324,7 @@ bool cVeDrEndTime::Parse(bool force) { return false; tokenContainer->Clear(); tokenContainer->AddStringToken((int)eDREndTimeST::recend, *end); - tokenContainer->AddIntToken((int)eDREndTimeIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDREndTimeIT::timeshift, timeShiftActive); SetDirty(); changed = false; return true; @@ -337,7 +337,7 @@ cVeDrProgressBar::cVeDrProgressBar(void) { current = -1; total = -1; timeshiftTotal = -1; - timeshiftActive = false; + timeShiftActive = NoRec; changed = true; } @@ -353,12 +353,12 @@ void cVeDrProgressBar::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrProgressBar::Set(int current, int total, bool timeshiftActive, int timeshiftTotal) { +void cVeDrProgressBar::Set(int current, int total, eRecType_t timeShiftActive, int timeshiftTotal) { if (!(this->current != current || this->total != total)) return; this->current = current; this->total = total; - this->timeshiftActive = timeshiftActive; + this->timeShiftActive = timeShiftActive; this->timeshiftTotal = timeshiftTotal; changed = true; @@ -371,7 +371,7 @@ bool cVeDrProgressBar::Parse(bool force) { tokenContainer->Clear(); tokenContainer->AddIntToken((int)eDRProgressbarIT::current, current); tokenContainer->AddIntToken((int)eDRProgressbarIT::total, total); - tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshift, timeShiftActive); tokenContainer->AddIntToken((int)eDRProgressbarIT::timeshifttotal, timeshiftTotal); SetDirty(); @@ -384,7 +384,7 @@ bool cVeDrProgressBar::Parse(bool force) { cVeDrCutMarks::cVeDrCutMarks(void) { cutmarksIndex = -1; lastMarks = NULL; - timeshiftActive = false; + timeShiftActive = NoRec; Reset(); } @@ -405,11 +405,11 @@ void cVeDrCutMarks::SetTokenContainer(void) { InheritTokenContainer(); } -void cVeDrCutMarks::Set(const cMarks *marks, int current, int total, bool timeshiftActive, int timeshiftTotal) { +void cVeDrCutMarks::Set(const cMarks *marks, int current, int total, eRecType_t timeShiftActive, int timeshiftTotal) { this->marks = marks; this->current = current; this->total = total; - this->timeshiftActive = timeshiftActive; + this->timeShiftActive = timeShiftActive; this->timeshiftTotal = timeshiftTotal; } @@ -421,7 +421,7 @@ void cVeDrCutMarks::Reset(void) { delete[] lastMarks; lastMarks = NULL; markActive = -1; - timeshiftActive = false; + timeShiftActive = NoRec; timeshiftTotal = -1; } @@ -432,7 +432,7 @@ bool cVeDrCutMarks::Parse(bool force) { return false; } tokenContainer->Clear(); - tokenContainer->AddIntToken((int)eDRCutmarksIT::timeshift, timeshiftActive); + tokenContainer->AddIntToken((int)eDRCutmarksIT::timeshift, timeShiftActive); int numMarks = marks->Count(); vector cutmarksInfo; cutmarksInfo.push_back(numMarks); @@ -444,7 +444,7 @@ bool cVeDrCutMarks::Parse(bool force) { for (const cMark *m = marks->First(); m; m = marks->Next(m)) { tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::position, *cString::sprintf("%d", m->Position())); tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::total, *tot); - if (timeshiftActive) { + if (timeShiftActive) { tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::timeshifttotal, *timeshifttot); } tokenContainer->AddLoopToken(cutmarksIndex, i, (int)eDRCutmarksLT::startmark, isStartMark ? "1" : "0"); diff --git a/coreengine/viewelementsdisplayreplay.h b/coreengine/viewelementsdisplayreplay.h index 0cc4be6..27d66ca 100644 --- a/coreengine/viewelementsdisplayreplay.h +++ b/coreengine/viewelementsdisplayreplay.h @@ -4,6 +4,13 @@ #include "viewelement.h" #include "../extensions/scrapmanager.h" +// define recordingtypes +enum eRecType_t { + NoRec = 0, + NormalRec, + TimeshiftRec +}; + /****************************************************************** * cVeDrRecTitle ******************************************************************/ @@ -12,12 +19,12 @@ private: const cRecording *recording; const cEvent *event; char *title; - bool timeshiftActive; + eRecType_t timeShiftActive; public: cVeDrRecTitle(void); virtual ~cVeDrRecTitle(void); void SetTokenContainer(void); - void Set(const cRecording *recording = NULL, const cEvent *event = NULL, bool timeshiftActive = false); + void Set(const cRecording *recording = NULL, const cEvent *event = NULL, eRecType_t timeShiftActive = NoRec); void Set(const char *title = NULL); bool Parse(bool forced = false); }; @@ -43,12 +50,12 @@ class cVeDrCurrentTime : public cViewElement { private: bool changed; char *current; - bool timeshiftActive; + eRecType_t timeShiftActive; public: cVeDrCurrentTime(void); virtual ~cVeDrCurrentTime(void); void SetTokenContainer(void); - void Set(const char *current, bool timeshiftActive = false); + void Set(const char *current, eRecType_t timeShiftActive = NoRec); bool Parse(bool forced = false); }; @@ -59,13 +66,13 @@ class cVeDrTotalTime : public cViewElement { private: bool changed; char *total; - bool timeshiftActive; + eRecType_t timeShiftActive; char *timeshiftDuration; public: cVeDrTotalTime(void); virtual ~cVeDrTotalTime(void); void SetTokenContainer(void); - void Set(const char *total, const char *timeshiftDuration = NULL, bool timeshiftActive = false); + void Set(const char *total, const char *timeshiftDuration = NULL, eRecType_t timeShiftActive = NoRec); bool Parse(bool forced = false); }; @@ -78,12 +85,12 @@ private: cString playbacktime; cString timeshiftrest; bool changed; - bool timeshiftActive; + eRecType_t timeShiftActive; public: cVeDrTimeshiftTimes(void); virtual ~cVeDrTimeshiftTimes(void); void SetTokenContainer(void); - void Set(cString start, cString playbacktime, cString timeshiftrest, bool timeshiftActive = false); + void Set(cString start, cString playbacktime, cString timeshiftrest, eRecType_t timeShiftActive = NoRec); bool Parse(bool forced = false); }; @@ -93,13 +100,13 @@ public: class cVeDrEndTime : public cViewElement { private: cString end; - bool timeshiftActive; + eRecType_t timeShiftActive; bool changed; public: cVeDrEndTime(void); virtual ~cVeDrEndTime(void); void SetTokenContainer(void); - void Set(cString end, bool timeshiftActive = false); + void Set(cString end, eRecType_t timeShiftActive = NoRec); bool Parse(bool forced = false); }; @@ -110,14 +117,14 @@ class cVeDrProgressBar : public cViewElement { private: int current; int total; - bool timeshiftActive; + eRecType_t timeShiftActive; int timeshiftTotal; bool changed; public: cVeDrProgressBar(void); virtual ~cVeDrProgressBar(void); void SetTokenContainer(void); - void Set(int current, int total, bool timeshiftActive = false, int timeshiftTotal = 0); + void Set(int current, int total, eRecType_t timeShiftActive = NoRec, int timeshiftTotal = 0); bool Parse(bool forced = false); }; @@ -130,7 +137,7 @@ private: const cMarks *marks; int current; int total; - bool timeshiftActive; + eRecType_t timeShiftActive; int timeshiftTotal; int numMarksLast; int *lastMarks; @@ -141,7 +148,7 @@ public: cVeDrCutMarks(void); virtual ~cVeDrCutMarks(void); void SetTokenContainer(void); - void Set(const cMarks *marks, int current, int total, bool timeshiftActive = false, int timeshiftTotal = 0); + void Set(const cMarks *marks, int current, int total, eRecType_t timeShiftActive = NoRec, int timeshiftTotal = 0); void Reset(void); bool Parse(bool forced = false); }; diff --git a/skins/estuary4vdr/xmlfiles/displayreplay.xml b/skins/estuary4vdr/xmlfiles/displayreplay.xml index 3295d0d..4643228 100644 --- a/skins/estuary4vdr/xmlfiles/displayreplay.xml +++ b/skins/estuary4vdr/xmlfiles/displayreplay.xml @@ -95,7 +95,8 @@ - + + diff --git a/skinskeleton/xmlfiles/displayreplay.xml b/skinskeleton/xmlfiles/displayreplay.xml index 7e2a1aa..1565b8a 100644 --- a/skinskeleton/xmlfiles/displayreplay.xml +++ b/skinskeleton/xmlfiles/displayreplay.xml @@ -58,7 +58,8 @@ {rectime} Time of Recording in hh:mm {eventstart} Starttime of coresponding event in timeshiftmode in hh:mm {eventstop} Endtime of coresponding event in timeshiftmode in hh:mm - {timeshift} true if a timeshifted recording is displayed + {timeshift} 1 if a active recording is displayed + 2 if a timeshift recording is displayed --> @@ -76,54 +77,60 @@ From e3becb6c61591c5b36c7deaee1a59b4764f54ee7 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 4 Mar 2021 17:40:34 +0100 Subject: [PATCH 4/6] Version 1.2.14 --- HISTORY | 5 +++++ skindesigner.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index 8c65fca..d30eb67 100644 --- a/HISTORY +++ b/HISTORY @@ -492,3 +492,8 @@ Version 1.2.13 - [kamel5] Add tokens eventstart and eventstop to eDRRecTitleST - [kamel5] Disabled timeshift display for non timeshift recordings - [kamel5] Add element timeShiftTimes with tokens recstart, playbacktime and timeshiftrest to displayreplay + +Version 1.2.14 + +- [kamel5] Revert "Disabled timeshift display for non timeshift recordings" +- [kamel5] Add a different display mode to timeshift for currently active timer recordings diff --git a/skindesigner.c b/skindesigner.c index 25290d5..cb5d760 100644 --- a/skindesigner.c +++ b/skindesigner.c @@ -21,7 +21,7 @@ #endif -static const char *VERSION = "1.2.13"; +static const char *VERSION = "1.2.14"; static const char *DESCRIPTION = trNOOP("Skin Designer"); class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI { From 5f7337b50c19a6d91e2262957423a8e5e83506cf Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sun, 7 Mar 2021 14:45:49 +0100 Subject: [PATCH 5/6] Update italian tanslation in estuary4vdr (thx to @fiveten_59 at vdr-portal.de) --- skins/estuary4vdr/globals.xml | 26 +++++++++++++------------- skins/estuary4vdr/setup.xml | 32 ++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/skins/estuary4vdr/globals.xml b/skins/estuary4vdr/globals.xml index 6a77984..f6e71d9 100644 --- a/skins/estuary4vdr/globals.xml +++ b/skins/estuary4vdr/globals.xml @@ -23,14 +23,14 @@ Wiederholungen Uusinnat Ismétlés - Riavvii + Repliche Reruns of Wiederholungen von Uusinnat: Ismétlés: - Riavvi di + Repliche: Actors @@ -156,7 +156,7 @@ Nur für Erwachsene Vain aikuisille Felnőtt - Adulti + Adulto Release Date @@ -170,7 +170,7 @@ Laufzeit Kesto Hossz - Runtime + Durata Popularity @@ -212,7 +212,7 @@ Länge der Aufnahme Tallenteen pituus Felvétel hossza - Lnghezza registrazzione + Lunghezza registrazione Cutted Recording Length @@ -268,42 +268,42 @@ Ende Loppu vég - Fine + fine active timers aktive Timer aktiivista ajastinta aktív időzítők - Timer attivi + timer attivi active timer aktiver Timer aktiivinen ajastin aktív időzítő - Timer attivo + timer attivo last recordings Neueste Aufnahmen Uusimmat tallenteet utolsó felvételek - Ultime registrazioni + ultime registrazioni system information System Informationen Järjestelmätiedot rendszer információ - Info di sistema + info di sistema disc HDD levy Lemez - Disco + disco free @@ -394,7 +394,7 @@ Windgeschwindigkeit Tuulen nopeus Szélsebesség - Velcità vento + Velocità vento Cloud Cover @@ -485,7 +485,7 @@ Unterstützte Plugins Tuetut laajennokset Támogatott Beépülő Modulok - Plugin supportati + Plugins supportati Used Fonts diff --git a/skins/estuary4vdr/setup.xml b/skins/estuary4vdr/setup.xml index 6fd8612..1d5de50 100644 --- a/skins/estuary4vdr/setup.xml +++ b/skins/estuary4vdr/setup.xml @@ -227,7 +227,7 @@ Aufzeichnungsmenü Tallennevalikko Felvételek Menü - Menù timer + Menù registrazioni Detailed Views (EPG, Rec, text) @@ -292,37 +292,41 @@ Einblendzeit der Kanalanzeige in ms. Ist dieser Wert auf einen Wert > 0 gesetzt, werden alle OSD Elemente ausser dem VDR Menu ein- und ausgeblendet. Häivytyksen kesto millisekunteina. Nollasta eriävä arvo aktivoi valikkojen häivytyksen. A csatorna kijelzés elhalványulás ms-ben. Ha ez az érték be van beállítva, hogy az érték > 0, az összes OSD elemek mellett a VDR menüt és elhalványulnak. - Tempo di dissolvenza della visualizzazione del canale in ms. Se questo è settato ad un valore maggiore di 0 tutti gli elementi OSD dietro al menù Vdr si dissolvono in entrata ed uscita + Tempo di dissolvenza della visualizzazione del canale in ms. Settato > di 0 tutti gli elementi OSD dietro al menù Vdr si dissolvono in entrata ed uscita Shift time [ms] Einfahrzeit [ms] Liukuman kesto [ms] Késleltetés ideje [ms] - Tempo di dissolvenza [ms] + Tempo di cambio [ms] Shift time in ms. If this is set to a value larger 0 all OSD elements beside the VDR menu are shifted in and out from the bottom of the screen. If fadetime is also set to a value larger 0, still shifting is performed. Einfahrzeit in ms. Ist dieser Wert auf einen Wert > 0 gesetzt, werden alle OSD Elemente ausser dem VDR Menu vom unteren Rand des Bildschirms herein- und herausgefahren. Falls fadetime ebenfalls auf einen Wert größer 0 gesetzt ist, wird das OSD trotzdem herein- und herausgefahren. Liukuman kesto millisekunteina. Nollasta eriävä arvo aktivoi valikkojen transitioefektit riippumatta häivytyksen kestosta. Késleltetés idő ms-ben. Ha ez be van állítva, hogy az érték > 0, az összes OSD elemek mellett a VDR menü eltolódik, és ki a képernyő alján. Ha fadetime is ennek az értéke nagyobb 0, mindig eltolásával végezzük. - Tempo di cambio in ms. Se questo è settato ad un valore maggiore di 0 tutti gli elementi OSD dietro al menù Vdr cambiano dalla parte bassa dello schermo. Se il tempo di cambio fosse settato anche ad un valore maggiore di zero, comunque il cambio viene effettuato + Tempo di cambio in ms. Settato > di 0 tutti gli elementi OSD di lato al menù Vdr cambiano dalla parte bassa dello schermo. Se il tempo di cambio fosse settato anche ad un valore > di zero, comunque il cambio viene effettuato Fade time menus [ms] Überblendungszeit Menüs [ms] + Menù tempo di dissolvenza [ms] Shift time menus [ms] Übergangszeit Menüelemente [ms] + Menù Tempo di cambio [ms] Fade time of menu elements when scrolling through the menus. If set to 0, this effect is disabled. Überblendungszeit der Menüelemente beim Bewegen durch die Menüs. Steht dieser Wert auf 0, ist dieser Effekt deaktiviert. + Tempo dissolvenza elementi del menù scorrendo i menù. Settato a 0, questo effetto è disabilitato Shift time of menu elements when scrolling through the menus. If set to 0, this effect is disabled. Übergangszeit der Menüelemente beim Bewegen durch die Menüs. Steht dieser Wert auf 0, ist dieser Effekt deaktiviert. + Tempo cambio elementi del menù scorrendo i menù. Settato a 0, questo effetto è disabilitato @@ -426,10 +430,12 @@ Number of items in channels list Anzahl der Elemente in Kanalliste + Numero voci nella lista canali Number of items in channel group list Anzahl der Elemente in Kanalgruppenliste + Numero voci nella lista gruppo canali Font size remaining time present event @@ -494,7 +500,7 @@ Font size description Schriftgröße Beschreibung Kirjasintyypin koko kuvaukselle - Dimensione carattere testo breve + Dimensione carattere descrizione Font size time in channel list detail view @@ -548,13 +554,13 @@ Height channel hints (% of screen height) Höhe Kanal Hinweise (% der Bildschirmhöhe) Korkeus (% näytön korkeudesta) - Altezza suggerimenti canale (% della altezza del video) + Altezza suggerimenti canale (in % altezza dello schermo) Width channel hints (% of screen width) Breite Kanal Hinweise (% der Bildschirmbreite) Leveys (% näytön leveydestä) - Larghezza suggerimenti canale (% della larghezza del video) + Larghezza suggerimenti canale (in % larghezza dello schermo) @@ -606,7 +612,7 @@ Schriftgröße Header Kirjasintyypin koko otsikkopalkille Betűméret fejléc - Dimensione del font del header + Dimensione del font dell'intestazione Font size date @@ -656,7 +662,7 @@ Nummerierung der Listenelemente anzeigen Näytä numeroinnit valikkoriveillä A listaelemek kijelzőszámozása - Visualizzazione degli elementi della lista + Visualizzazione numerica degli elementi della lista Number of main menu items @@ -734,7 +740,7 @@ Schriftgröße Titel Kirjasintyypin koko nimikkeelle Betűméret cím - Posizione verticale del titolo EPG + Dimensione font del titolo Font size text @@ -877,11 +883,12 @@ Anzahl Menüelemente Valikkorivien lukumäärä menüpontok száma - Numero delle voci + Numero delle voci del menù Show posters Poster anzeigen + Mostra poster Vertical position date @@ -909,7 +916,7 @@ Schriftgröße Titel Kirjasintyypin koko nimikkeelle Betűméret cím - Posizione verticale del titolo + Dimensione font del titolo Vertical position folder name @@ -949,6 +956,7 @@ Font size small wide menu Schriftgröße Klein breites Menü + Dimensione font del menù piccolo Show info for selected list element From 9a0eac1c4feb8fbf9cac4733080e34b481d3ded3 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sun, 7 Mar 2021 19:27:18 +0100 Subject: [PATCH 6/6] Update italian tanslation in metrixhd (thx to @fiveten_59 at vdr-portal.de) --- skins/metrixhd/globals.xml | 19 +++++++++++------- skins/metrixhd/setup.xml | 41 ++++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 15 deletions(-) mode change 100644 => 100755 skins/metrixhd/globals.xml diff --git a/skins/metrixhd/globals.xml b/skins/metrixhd/globals.xml old mode 100644 new mode 100755 index 507398e..18ea94e --- a/skins/metrixhd/globals.xml +++ b/skins/metrixhd/globals.xml @@ -89,14 +89,14 @@ Wiederholungen Uusinnat Ismétlés - Riavvii + Repliche Reruns of Wiederholungen von Uusinnat: Ismétlés: - Riavvi di + Repliche di Actors @@ -215,14 +215,14 @@ Einnahmen Tuotto Bevétel - Incassi + Incasso Adult Nur für Erwachsene Vain aikuisille Felnőtt - Adulti + Adulto Release Date @@ -236,7 +236,7 @@ Laufzeit Kesto Hossz - Runtime + Durata Popularity @@ -278,7 +278,7 @@ Länge der Aufnahme Tallenteen pituus Felvétel hossza - Lnghezza registrazzione + Lunghezza registrazione Cutted Recording Length @@ -383,7 +383,7 @@ Windgeschwindigkeit Tuulen nopeus Szélsebesség - Velcità vento + Velocità vento Cloud Cover @@ -465,22 +465,27 @@ last recordings Neueste Aufnahmen + ultime registrazioni system information System Informationen + info di sistema System load: Systemlast: + Utilizzo del sistema VDR CPU VDR CPU + VDR CPU new neu + nuovo diff --git a/skins/metrixhd/setup.xml b/skins/metrixhd/setup.xml index 0afe492..21d1702 100644 --- a/skins/metrixhd/setup.xml +++ b/skins/metrixhd/setup.xml @@ -40,79 +40,98 @@ Main Menu Hauptmenü + Menù principale Small Main Menu Schmales Hauptmenü + Menù principale piccolo Fade time of current element [ms] Einblendzeit des aktiven Elements [ms] + Tempo di dissolvenza dell'elemento attuale Fade time in ms. If this is set to a value larger 0 the current OSD element fade in and out. Einblendzeit in ms. Ist dieser Wert auf einen Wert > 0 gesetzt, wird das aktive OSD Element ein- und ausgeblendet + Tempo di dissolvenza in ms. Settato a valore > 0 l'attuale OSD si dissolve in entrata e uscita Show information about timers, newest recordings, system load... 'oldstyle' showes the wide timer element but lacks some other infos. Zeige Informationen über Timer, neuste Aufnahmen, Systemlast... 'oldstyle' zeigt dabei des breite Timer-Element, nutzt dafür aber nicht alle Infos. + Mostra info su timers, nuove registrazioni, carico sistema... 'oldstyle mostra l'elemento timer ampio ma mancano altre info Show Scrollbar in Main Menu. Auto hides the scrollbar if its not needed. Zeige die Scroll-Leiste im Hauptmenü. Auto versteckt die Leiste, wenn sie nicht benötigt wird. + Mostra barra scorrimento in menù principale. Auto disabilita la barra se non necessaria Off, main menu only or main menu and channelinfo Aus, nur Hauptmenü oder Haputmenü und Kanalinformationen + Spento, solo menù principale o menù princ. e info canale Number of Information lists items (max) Elemente in den Info-Listen (max) + Numero voci lista Informazioni (max) Number of Channel list items (max) Elemente in der Kanalliste (max) + Numero voci lista canali (max) Number of list items (max) Elemente in andern Listen (max) + Numero voci lista (max) Number of Main Menu items (max) Elemente im Hauptmenü (max) + Numero voci Menù principale (max) main menu im Hauptmenü + menù principale no nein + no yes ja + si automatic automatisch + automatico oldsytle oldstyle + oldstyle Show Scrollbar Zeige Scrollbar + Mostra barra scorrimento Show Weather info Wetter Info anzeigen + Mostra info Meteo Show Information in main menu Zeige Informationen im Hauptmenü + Mostra info nel menù principale @@ -142,18 +161,19 @@ Disable text scolling Text-Scrolling abschalten + Disabilita scorrimento testo Height channel hints (% of screen height) Höhe Kanal Hinweise (% der Bildschirmhöhe) Korkeus (% näytön korkeudesta) - Altezza suggerimenti canale (% della altezza del video) + Altezza suggerimenti canale (in % altezza dello schermo) Width channel hints (% of screen width) Breite Kanal Hinweise (% der Bildschirmbreite) Leveys (% näytön leveydestä) - Larghezza suggerimenti canale (% della larghezza del video) + Larghezza suggerimenti canale (in % larghezza dello schermo) @@ -166,7 +186,7 @@ Fade time in ms. If this is set to a value larger 0 all OSD elements beside the VDR menu fade in and out. Einblendzeit in ms. Ist dieser Wert auf einen Wert > 0 gesetzt, werden alle OSD Elemente ausser dem VDR Menu ein- und ausgeblendet Häivytyksen kesto millisekunteina. Nollasta eriävä arvo aktivoi häivytyksen. - Tempo di dissolvenza in ms. Se settato su un valore maggiore di 0 tutti gli elementi OSD accanto al menu di VDR si dissolvono in entrata ed uscita. + Tempo di dissolvenza in ms. Settato > di 0 tutti gli elementi OSD accanto al menu di VDR si dissolvono in entrata ed uscita. Shift time Channel Display [ms] @@ -178,7 +198,7 @@ Shifting time in ms. If this is set to a value larger 0 all OSD elements beside the VDR menu are shifted in and out from the bottom of the screen. If fadetime is also set to a value larger 0, still shifting is performed Einfahrzeit in ms. Ist dieser Wert auf einen Wert > 0 gesetzt, werden alle OSD Elemente ausser dem VDR Menu vom unteren Rand des Bildschirms herein- und herausgefahren. Falls fadetime ebenfalls auf einen Wert größer 0 gesetzt ist, wird das OSD trotzdem herein- und herausgefahren. Liukuman kesto millisekunteina. Nollasta eriävä arvo aktivoi valikkojen transitioefektit riippumatta häivytyksen kestosta. - Tempi cambio canale in ms. Se settato su un valore maggiore di 0 tutti gli elementi OSD accanto al menu di VDR vengono spostati in e out dal basso dello schermo. Lo spostamento è effettuato anche con tempo di dissolvenza maggiore di 0 + Tempi cambio canale in ms. Settato su un valore > di 0 tutti gli elementi OSD accanto al menu di VDR vengono spostati in e out dal basso dello schermo. Lo spostamento è effettuato anche con tempo di dissolvenza > di 0 Shift time Channel Date, Time, Weather [ms] @@ -190,7 +210,7 @@ Shifting time of OSD Elements date, time and weather when switching in ms. If set to 0, the elements are shown immediately. Einfahrzeit der OSD Elemente Datum, Zeit und Wetter während des Umschaltens in ms. Steht dieser Wert auf 0, werden die Elemente sofort angezeigt. Liukuman kesto millisekunteina. Nollasta eriävä arvo aktivoi päivämäärän, kellonajan ja säätietojen transitioefektit. - Tempi di cambio degli elemti OSD, Canale, Data, Tempo, Previsioni espressi in ms. Se impostato a0 gli elementi sono mostrati immediatamente. + Tempi di cambio degli elemti OSD, Canale, Data, Tempo, Previsioni espressi in ms. Settato a 0 gli elementi sono mostrati immediatamente. Shift time Timers Main Menu [ms] @@ -202,23 +222,27 @@ Shifting time of timers display in main menu in ms. If set to 0, the timers are shown immediately. Einfahrzeit der Timer im Hauptmenü in ms. Steht dieser Wert auf 0, werden die Timer sofort angezeigt. Liukuman kesto millisekunteina. Nollasta eriävä arvo aktivoi transitioefektit päävalikon ajastimille. - Tempi di cambio del display dei Timer nel menù principale in ms. Se impostati a 0, i timers sono mostrati immediatamente. + Tempi di cambio del display dei Timer nel menù principale in ms. Impostati a 0, i timers sono mostrati immediatamente. Fade time menus [ms] Überblendungszeit Menüs [ms] + Menù tempo dissolvenza [ms] Shift time menus [ms] Übergangszeit Menüelemente [ms] + Menù tempo cambio [ms] Fade time of menu elements when scrolling through the menus. If set to 0, this effect is disabled. Überblendungszeit der Menüelemente beim Bewegen durch die Menüs. Steht dieser Wert auf 0, ist dieser Effekt deaktiviert. + Tempo dissolvenza menù elementi scorrendo i menù. Settato a 0, questo effetto è disabilitato Shift time of menu elements when scrolling through the menus. If set to 0, this effect is disabled. Übergangszeit der Menüelemente beim Bewegen durch die Menüs. Steht dieser Wert auf 0, ist dieser Effekt deaktiviert. + Tempo cambio menù elementi scorrendo i menù. Settato a 0, questo effetto è disabilitato Show DVB device info @@ -230,7 +254,7 @@ If set to true, information about usage of each available DVB device is displayed during channel switching and in the main menu Falls diese Option aktiviert ist, werden beim Umschalten und im Hauptmenü Informationen über alle verfügbaren DVB Devices ausgegeben. Näytetään DVB-laitteiden käyttötiedot päävalikossa ja kanavanvaihdossa. - Se settata su true, sono mostrate info riguardo l'uso di ciascun device DVB durante i cambi canale e nel menù principale. + Settata su true, sono mostrate info riguardo l'uso di ciascun device DVB durante i cambi canale e nel menù principale. Orientation of main menu @@ -242,7 +266,7 @@ Orientation of main menu. If orientation is set to horizontal, only the current list element is displayed. If set to vertical, 8 elements are shown in the list. Ausrichtung des Hauptmenüs. Falls die Ausrichtung auf horizontal gesetzt ist, wird nur das aktuelle Listenelement ausgegeben. Ist die Ausrichtung vertikal, werden 8 Listenelemente angezeigt. Päävalikon orientaatio. Vaakasuuntainen: näytetään ainoastaan aktiivinen listaelementti. Pystysuuntainen: näytetään 8 elementtiä listana. - Orientamento menù principale. Se l'orientamento è su orizzontale, è mostrato solo l'attuale lista degli elementi. Se settata su verticale, nella lista sono mostrati 8 elementi. + Orientamento menù principale. Settato su orizzontale, è mostrato solo l'attuale lista degli elementi. Se settata su verticale, nella lista sono mostrati 8 elementi. Orientation of recordings menu @@ -259,6 +283,7 @@ Orientation of setup menu Ausrichtung des Einstellungsmenüs + Orientamento Menù setup horizontal menu