From c59f47cab379bf8e169ececb51b6d3a54b5868b4 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 18 Jun 2010 04:57:07 +0000 Subject: [PATCH] show only standard icon size git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@632 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4f23553a2747f7c107d89f3448ae90b74dcc0839 Author: Jacek Jendrzej Date: 2010-06-18 (Fri, 18 Jun 2010) ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index cfa0b571b..d91a6ed54 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -623,21 +623,24 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start //show Content&Component for Dolby & 16:9 CSectionsdClient::ComponentTagList tags; - if ( sectionsd_getComponentTagsUniqueKey( epgData.eventID, tags ) ) - { - for (unsigned int i=0; i< tags.size(); i++) + int dummy_h,dummy_w; + frameBuffer->getIconSize(NEUTRINO_ICON_16_9_GREY, &dummy_w, &dummy_h); + if (dummy_h == 16 && dummy_w == 26){ // show only standard icon size + if ( sectionsd_getComponentTagsUniqueKey( epgData.eventID, tags ) ) { - if ( tags[i].streamContent == 1 && (tags[i].componentType == 2 || tags[i].componentType == 3) ) + for (unsigned int i=0; i< tags.size(); i++) { - frameBuffer->paintIcon(NEUTRINO_ICON_16_9 ,ox+sx-(ICON_LARGE_WIDTH+2)-(ICON_LARGE_WIDTH+2),sy + oy+5 ); - } - else if ( tags[i].streamContent == 2 && tags[i].componentType == 5 ) - { - frameBuffer->paintIcon(NEUTRINO_ICON_DD, ox+sx-(ICON_LARGE_WIDTH+2), sy + oy+5); + if ( tags[i].streamContent == 1 && (tags[i].componentType == 2 || tags[i].componentType == 3) ) + { + frameBuffer->paintIcon(NEUTRINO_ICON_16_9 ,ox+sx-(ICON_LARGE_WIDTH+2)-(ICON_LARGE_WIDTH+2),sy + oy+5 ); + } + else if ( tags[i].streamContent == 2 && tags[i].componentType == 5 ) + { + frameBuffer->paintIcon(NEUTRINO_ICON_DD, ox+sx-(ICON_LARGE_WIDTH+2), sy + oy+5); + } } } } - //show progressbar if ( epg_done!= -1 ) {