diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index 0d47895..4397ffa 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -950,12 +950,23 @@ bool cVeDmLastrecordings::Parse(bool forced) { continue; } #endif - string recFullPath = recording->Name() ? recording->Name() : ""; string recName = ""; - string recPath = ""; - RecName(recFullPath, recName, recPath); + string recSeriesName = ""; + const cRecordingInfo *recInfo = recording->Info(); + if (recInfo) { + recName = recInfo->Title() ? recInfo->Title() : ""; + if (recInfo->Title() && recInfo->ShortText()) { + stringstream ss; + ss << recInfo->Title() << " - " << recInfo->ShortText(); + recSeriesName = ss.str(); + } + } else { + string recPath = recording->Name() ? recording->Name() : ""; + RecName(recPath, recName); + } + if (recName.size() == 0) + recName = recording->Name() ? recording->Name() : ""; cString recDuration = cString::sprintf("%d", recording->LengthInSeconds()/60); - string posterPath = ""; int posterWidth = 0; int posterHeight = 0; @@ -963,7 +974,7 @@ bool cVeDmLastrecordings::Parse(bool forced) { RecPoster(recording, posterWidth, posterHeight, posterPath, hasPoster); tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::name, recName.c_str()); - tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::seriesname, recPath.c_str()); + tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::seriesname, recSeriesName.c_str()); tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::date, *ShortDateString(recording->Start())); tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::time, *TimeString(recording->Start())); tokenContainer->AddLoopToken(recIndex, i, (int)eDMLastrecordingsLT::duration, *recDuration); @@ -981,7 +992,7 @@ bool cVeDmLastrecordings::Parse(bool forced) { return true; } -void cVeDmLastrecordings::RecName(string &path, string &name, string &folder) { +void cVeDmLastrecordings::RecName(string &path, string &name) { size_t delim = path.find_last_of('~'); if (delim == string::npos) { name = path; @@ -994,12 +1005,6 @@ void cVeDmLastrecordings::RecName(string &path, string &name, string &folder) { if (name.find('%') == 0) { name = name.substr(1); } - folder = path.substr(0, delim); - size_t delim2 = folder.find_last_of('~'); - if (delim2 == string::npos) { - return; - } - folder = folder.substr(delim2+1); } /****************************************************************** * cVeDmDetailheaderEpg diff --git a/coreengine/viewelementsdisplaymenu.h b/coreengine/viewelementsdisplaymenu.h index 26cbbc9..59ce03d 100644 --- a/coreengine/viewelementsdisplaymenu.h +++ b/coreengine/viewelementsdisplaymenu.h @@ -184,7 +184,7 @@ public: class cVeDmLastrecordings : public cViewElement, public cScrapManager { private: int recIndex; - void RecName(string &path, string &name, string &folder); + void RecName(string &path, string &name); public: cVeDmLastrecordings(void); virtual ~cVeDmLastrecordings(void); diff --git a/skins/estuary4vdr/xmlfiles/displaymenumain.xml b/skins/estuary4vdr/xmlfiles/displaymenumain.xml index d6f0b67..1671be4 100644 --- a/skins/estuary4vdr/xmlfiles/displaymenumain.xml +++ b/skins/estuary4vdr/xmlfiles/displaymenumain.xml @@ -38,10 +38,14 @@ - - - - + + + + + + + +