Merge branch 'master' into installer

7 files changed, 28 insertions, 7 deletions

diff --git a/HISTORY b/HISTORY
index 81fb3a7..f48f2d0 100644
--- a/HISTORY
+++ b/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
diff --git a/displayreplay.c b/displayreplay.c
index 7ae5e69..130f0e4 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -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);
diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c
index 869daf6..ac1c2e7 100644
--- a/libtemplate/templateview.c
+++ b/libtemplate/templateview.c
@@ -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);
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
diff --git a/skindesigner.c b/skindesigner.c
index 0a05143..cae0e6e 100644
--- a/skindesigner.c
+++ b/skindesigner.c
@@ -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 {
diff --git a/skinskeleton/xmlfiles/displaymenumain.xml b/skinskeleton/xmlfiles/displaymenumain.xml
index 0eeb538..ac4af30 100644
--- a/skinskeleton/xmlfiles/displaymenumain.xml
+++ b/skinskeleton/xmlfiles/displaymenumain.xml
@@ -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
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index 6de16c7..6a19433 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -38,7 +38,6 @@ cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(root
 }
 
 cDisplayMenuRootView::~cDisplayMenuRootView() {
-    CancelSave();
     if (view) {
         delete view;
         view = NULL;
diff --git a/views/viewhelpers.c b/views/viewhelpers.c
index cc72c9b..d504dad 100644
--- a/views/viewhelpers.c
+++ b/views/viewhelpers.c
@@ -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;