diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index c982d3eba..5d51750b8 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2107,6 +2107,25 @@ void CChannelList::paint() liststart = (selected/listmaxshow)*listmaxshow; updateEvents(this->historyMode ? 0:liststart, this->historyMode ? 0:(liststart + listmaxshow)); + if (g_settings.channellist_additional == 2) // with miniTV + { + // paint box for miniTV again - important! + frameBuffer->paintBoxFrame(x+width, y+theight , pig_width, pig_height, 10, COL_MENUCONTENT_PLUS_0, 0); + // 5px offset - same value as in list below +#if 0 + /* focus: its possible now to scale video with still image, but on nevis + artifacts possible on SD osd */ + paint_pig(x+width+5, y+theight+5, pig_width-10, pig_height-10); +#else + if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_tv) { + paint_pig(x+width+5, y+theight+5, pig_width-10, pig_height-10); + } + else if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio) { + g_PicViewer->DisplayImage(DATADIR "/neutrino/icons/radiomode.jpg", x+width+5, y+theight+5, pig_width-10, pig_height-10, frameBuffer->TM_NONE); + } +#endif + } + // paint background for main box frameBuffer->paintBoxRel(x, y+theight, width, height-footerHeight-theight, COL_MENUCONTENT_PLUS_0); if (g_settings.channellist_additional) @@ -2114,7 +2133,7 @@ void CChannelList::paint() // disable displayNext displayNext = false; // paint background for right box - frameBuffer->paintBoxRel(x+width,y+theight,infozone_width,pig_height+infozone_height,COL_MENUCONTENT_PLUS_0); + frameBuffer->paintBoxRel(x+width,y+theight+pig_height,infozone_width,infozone_height,COL_MENUCONTENT_PLUS_0); } for(unsigned int count = 0; count < listmaxshow; count++) { @@ -2132,24 +2151,6 @@ void CChannelList::paint() frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs*(sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); showChannelLogo(); - if (g_settings.channellist_additional == 2) // with miniTV - { - // paint box for miniTV again - important! - frameBuffer->paintBoxRel(x+width, y+theight , pig_width, pig_height, COL_MENUCONTENT_PLUS_0); - // 5px offset - same value as in list below -#if 0 - /* focus: its possible now to scale video with still image, but on nevis - artifacts possible on SD osd */ - paint_pig(x+width+5, y+theight+5, pig_width-10, pig_height-10); -#else - if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_tv) { - paint_pig(x+width+5, y+theight+5, pig_width-10, pig_height-10); - } - else if(CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio) { - g_PicViewer->DisplayImage(DATADIR "/neutrino/icons/radiomode.jpg", x+width+5, y+theight+5, pig_width-10, pig_height-10, frameBuffer->TM_NONE); - } -#endif - } } bool CChannelList::isEmpty() const diff --git a/src/gui/channellist.h b/src/gui/channellist.h index 2f8d309f4..8457334c8 100644 --- a/src/gui/channellist.h +++ b/src/gui/channellist.h @@ -114,9 +114,9 @@ private: void calcSize(); std::string MaxChanNr(); void paint_pig(int x, int y, int w, int h); - void paint_events(int index); - CChannelEventList evtlist; - void readEvents(const t_channel_id channel_id); + void paint_events(int index); + CChannelEventList evtlist; + void readEvents(const t_channel_id channel_id); void showdescription(int index); typedef std::pair epg_pair; std::vector epgText;