mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
Merge branch 'master' into installer
This commit is contained in:
commit
0936766c7b
7
HISTORY
7
HISTORY
@ -335,3 +335,10 @@ Version 0.4.6
|
||||
|
||||
Version 0.4.7
|
||||
|
||||
- fixed crash when deleting menuitem
|
||||
- fixed ecm time display
|
||||
- provide 10 last recordings in <lastrecordings> viewelement
|
||||
- fixed translation in currentelement loops
|
||||
- fixed timeshifttotal in displayreplay timeshift mode
|
||||
|
||||
Version 0.4.8
|
||||
|
@ -131,7 +131,7 @@ void cSDDisplayReplay::SetTimeShiftValues(const cRecording *recording) {
|
||||
return;
|
||||
double fps = recording->FramesPerSecond();
|
||||
time_t liveEventStop = event->EndTime();
|
||||
time_t recordingStart = recording->Start();
|
||||
time_t recordingStart = time(0) - recording->LengthInSeconds();
|
||||
int framesTotal = (liveEventStop - recordingStart)*fps;
|
||||
int recLength = liveEventStop - recordingStart;
|
||||
replayView->SetTimeShift(framesTotal, recLength);
|
||||
|
@ -434,6 +434,21 @@ void cTemplateView::Translate(void) {
|
||||
func->SetTranslatedText(translation);
|
||||
}
|
||||
}
|
||||
if (func->GetType() == ftLoop) {
|
||||
cTemplateLoopFunction *funcsLoop = dynamic_cast<cTemplateLoopFunction*>(func);
|
||||
funcsLoop->InitIterator();
|
||||
cTemplateFunction *loopFunc = NULL;
|
||||
while(loopFunc = funcsLoop->GetNextFunction()) {
|
||||
if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox || func->GetType() == ftDrawTextVertical) {
|
||||
string text = loopFunc->GetParameter(ptText);
|
||||
string translation;
|
||||
bool translated = globals->Translate(text, translation);
|
||||
if (translated) {
|
||||
loopFunc->SetTranslatedText(translation);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -19,7 +19,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
static const char *VERSION = "0.4.7";
|
||||
static const char *VERSION = "0.4.8";
|
||||
static const char *DESCRIPTION = trNOOP("Skin Designer");
|
||||
|
||||
class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {
|
||||
|
@ -20,9 +20,9 @@
|
||||
<timers detached="false">
|
||||
</timers>
|
||||
|
||||
<!-- Available Variables lastrecordings: 5 newest recordings
|
||||
<!-- Available Variables lastrecordings: 10 newest recordings
|
||||
{numtimers} number of active timers
|
||||
{recordings[]} array with 5 newest recordings
|
||||
{recordings[]} array with 10 newest recordings
|
||||
{recordings[name]} name of recording
|
||||
{recordings[seriesname]} series name if available
|
||||
{recordings[date]} date of recording in dd.mm.yy
|
||||
|
@ -38,7 +38,6 @@ cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(root
|
||||
}
|
||||
|
||||
cDisplayMenuRootView::~cDisplayMenuRootView() {
|
||||
CancelSave();
|
||||
if (view) {
|
||||
delete view;
|
||||
view = NULL;
|
||||
|
@ -873,7 +873,7 @@ void cViewHelpers::SetLastRecordings(map<string,int> *intTokens, map<string,stri
|
||||
recVals.insert(pair< string, string >("recordings[posterheight]", sPosterHeight.str()));
|
||||
lastRecordings->push_back(recVals);
|
||||
found++;
|
||||
if (found == 5)
|
||||
if (found == 10)
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -938,7 +938,7 @@ bool cViewHelpers::SetEcmInfos(int channelSid, stringmap &stringTokens, intmap &
|
||||
return false;
|
||||
}
|
||||
|
||||
if (ecmInfo.hops < 0 || ecmInfo.ecmtime <= 0)
|
||||
if (ecmInfo.hops < 0 || ecmInfo.ecmtime <= 0 || ecmInfo.ecmtime > 100000)
|
||||
return false;
|
||||
if (CompareECMInfos(&ecmInfo))
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user