mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix compil warnings

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e681ca2b04
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-28 (Thu, 28 Jul 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-07-28 15:17:01 +02:00
parent 96367f4a5d
commit e6db442ed0
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/epgview.cpp
View File

@@ -487,7 +487,7 @@ bool CEpgData::isCurrentEPG(const t_channel_id channel_id)
return false; return false;
} }
int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position, int mp_duration, bool doLoop) int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*mp_duration*/, bool doLoop)
{ {
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
static uint64_t channel_id = 0; static uint64_t channel_id = 0;
@@ -506,12 +506,10 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position, int mp_dura
stars = 0; stars = 0;
tmdb_str = mp_movie_info->epgInfo2; tmdb_str = mp_movie_info->epgInfo2;
CComponentsHeader* header = NULL; CComponentsHeader* _header = NULL;
CComponentsPicture* headerPic = NULL; CComponentsPicture* headerPic = NULL;
CComponentsText* headerText = NULL; CComponentsText* headerText = NULL;
int height = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight();
if (mp_movie_info->epgTitle.empty()) /* no epg info found */ if (mp_movie_info->epgTitle.empty()) /* no epg info found */
{ {
ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND)); // UTF-8 ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND)); // UTF-8
@@ -644,7 +642,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position, int mp_dura
//show the epg //show the epg
// header + logo // header + logo
int header_h = std::max(toph, logo_h); int header_h = std::max(toph, logo_h);
header = new CComponentsHeader(sx, sy, ox, header_h); _header = new CComponentsHeader(sx, sy, ox, header_h);
if (pic_offx > 0) { if (pic_offx > 0) {
headerPic = new CComponentsPicture(sx+10, sy + (header_h-logo_h)/2, logo_w, logo_h, lname); headerPic = new CComponentsPicture(sx+10, sy + (header_h-logo_h)/2, logo_w, logo_h, lname);
headerPic->doPaintBg(false); headerPic->doPaintBg(false);
@@ -653,7 +651,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position, int mp_dura
headerText = new CComponentsText(sx+15+pic_offx, sy, ox-15-pic_offx, header_h, textAll, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]); headerText = new CComponentsText(sx+15+pic_offx, sy, ox-15-pic_offx, header_h, textAll, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]);
headerText->doPaintBg(false); headerText->doPaintBg(false);
headerText->setTextColor(COL_MENUHEAD_TEXT); headerText->setTextColor(COL_MENUHEAD_TEXT);
header->paint(CC_SAVE_SCREEN_NO); _header->paint(CC_SAVE_SCREEN_NO);
headerText->paint(CC_SAVE_SCREEN_NO); headerText->paint(CC_SAVE_SCREEN_NO);
if (headerPic) if (headerPic)
headerPic->paint(CC_SAVE_SCREEN_NO); headerPic->paint(CC_SAVE_SCREEN_NO);
@@ -677,6 +675,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position, int mp_dura
::paintButtons(sx + 10, sy+oy, 0, 2, Button, aw, h, "", false, COL_INFOBAR_SHADOW_TEXT, NULL, 1); ::paintButtons(sx + 10, sy+oy, 0, 2, Button, aw, h, "", false, COL_INFOBAR_SHADOW_TEXT, NULL, 1);
#if 0 #if 0
int height = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight();
//show progressbar //show progressbar
epg_done = mp_position/mp_duration*100; epg_done = mp_position/mp_duration*100;
if ( epg_done > 0 ) if ( epg_done > 0 )
@@ -807,8 +806,8 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position, int mp_dura
delete headerPic; delete headerPic;
if (headerText) if (headerText)
delete headerText; delete headerText;
if (header) if (_header)
delete header; delete _header;
return res; return res;
} }