frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into weatherfc

Browse Source
This commit is contained in:
louis 2015-01-13 10:09:39 +01:00
commit 30b3a8c935
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skinskeleton/xmlfiles/displaymenudetailrecording.xml
View File

@ -25,6 +25,9 @@
{bannerpath} path of banner {bannerpath} path of banner
{recimgavailable} true if a recording image is available in the recording path {recimgavailable} true if a recording image is available in the recording path
{recimgpath} path of rec image {recimgpath} path of rec image
{recchannelname} name of channel from which was recorded
{recchannelid} id of channel from which was recorded
{recchannelnumber} number of channel from which was recorded
--> -->
<detailheader> <detailheader>
</detailheader> </detailheader>
@ -51,6 +54,9 @@
{recordingbitrate} bitrate of recording (in MBit/s) {recordingbitrate} bitrate of recording (in MBit/s)
{recordingformat} format of recording (TS / PS) {recordingformat} format of recording (TS / PS)
{searchtimer} name of accordign searchtimer (if available) {searchtimer} name of accordign searchtimer (if available)
{recchannelname} name of channel from which was recorded
{recchannelid} id of channel from which was recorded
{recchannelnumber} number of channel from which was recorded
{recimg1avaialble} true if first recording image is available {recimg1avaialble} true if first recording image is available
{recimg2avaialble} true if first recording image is available {recimg2avaialble} true if first recording image is available

18
views/displaymenudetailview.c
View File

@ -413,7 +413,12 @@ void cDisplayMenuDetailView::LoadRecordingInformation(void) {
cChannel *channel = Channels.GetByChannelID(Info->ChannelID()); cChannel *channel = Channels.GetByChannelID(Info->ChannelID());
if (channel) { if (channel) {
stringTokens.insert(pair<string,string>("recchannelname", channel->Name())); stringTokens.insert(pair<string,string>("recchannelname", channel->Name()));
stringTokens.insert(pair<string,string>("recchannelid", *channel->GetChannelID().ToString()));
intTokens.insert(pair<string,int>("recchannelnumber", channel->Number())); intTokens.insert(pair<string,int>("recchannelnumber", channel->Number()));
} else {
stringTokens.insert(pair<string,string>("recchannelname", ""));
stringTokens.insert(pair<string,string>("recchannelid", ""));
intTokens.insert(pair<string,int>("recchannelnumber", 0));
} }
if (index) { if (index) {
@ -735,6 +740,16 @@ void cDisplayMenuDetailView::DrawHeader(void) {
headerIntTokens.insert(pair<string,int>("durationeventhours", duration / 60)); headerIntTokens.insert(pair<string,int>("durationeventhours", duration / 60));
headerStringTokens.insert(pair<string,string>("durationeventminutes", *cString::sprintf("%.2d", duration%60))); headerStringTokens.insert(pair<string,string>("durationeventminutes", *cString::sprintf("%.2d", duration%60)));
} }
cChannel *channel = Channels.GetByChannelID(info->ChannelID());
if (channel) {
headerStringTokens.insert(pair<string,string>("recchannelname", channel->Name()));
headerStringTokens.insert(pair<string,string>("recchannelid", *channel->GetChannelID().ToString()));
headerIntTokens.insert(pair<string,int>("recchannelnumber", channel->Number()));
} else {
headerStringTokens.insert(pair<string,string>("recchannelname", ""));
headerStringTokens.insert(pair<string,string>("recchannelid", ""));
headerIntTokens.insert(pair<string,int>("recchannelnumber", 0));
}
} else { } else {
headerStringTokens.insert(pair<string,string>("shorttext", "")); headerStringTokens.insert(pair<string,string>("shorttext", ""));
int recDuration = recording->LengthInSeconds(); int recDuration = recording->LengthInSeconds();
@ -747,6 +762,9 @@ void cDisplayMenuDetailView::DrawHeader(void) {
headerIntTokens.insert(pair<string,int>("durationevent", 0)); headerIntTokens.insert(pair<string,int>("durationevent", 0));
headerIntTokens.insert(pair<string,int>("durationeventhours", 0)); headerIntTokens.insert(pair<string,int>("durationeventhours", 0));
headerStringTokens.insert(pair<string,string>("durationeventminutes", "")); headerStringTokens.insert(pair<string,string>("durationeventminutes", ""));
headerStringTokens.insert(pair<string,string>("recchannelname", ""));
headerStringTokens.insert(pair<string,string>("recchannelid", ""));
headerIntTokens.insert(pair<string,int>("recchannelnumber", 0));
} }
string recImage = ""; string recImage = "";

5
views/displaymenuview.c
View File

@ -628,6 +628,11 @@ bool cDisplayMenuSchedulesView::DrawHeader(void) {
string channelID = *(channel->GetChannelID().ToString()); string channelID = *(channel->GetChannelID().ToString());
stringTokens.insert(pair<string,string>("channelid", channelID)); stringTokens.insert(pair<string,string>("channelid", channelID));
intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID))); intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
} else {
stringTokens.insert(pair<string,string>("channelnumber", ""));
stringTokens.insert(pair<string,string>("channelname", ""));
stringTokens.insert(pair<string,string>("channelid", ""));
intTokens.insert(pair<string, int>("channellogoexists", 0));
} }
bool hasIcon = false; bool hasIcon = false;
string icon = imgCache->GetIconName(menuTitle, cat); string icon = imgCache->GetIconName(menuTitle, cat);