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

Mode fb and picviewer cleanup; unify channel logo display code

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@259 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fb6607ba0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-05 (Fri, 05 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-05 15:26:57 +00:00
parent 6a43795692
commit 5121c12da2
16 changed files with 498 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/moviebrowser.cpp
View File

@@ -592,9 +592,8 @@ void CMovieBrowser::initFrames(void)
m_cBoxFrameTitleRel.iY = 0;
m_cBoxFrameTitleRel.iWidth = m_cBoxFrame.iWidth;
m_cBoxFrameTitleRel.iHeight = m_pcFontTitle->getHeight();
#ifndef FB_USE_PALETTE
if(m_cBoxFrameTitleRel.iHeight < PIC_H) m_cBoxFrameTitleRel.iHeight = PIC_H;
#endif
m_cBoxFrameBrowserList.iX = m_cBoxFrame.iX;
m_cBoxFrameBrowserList.iY = m_cBoxFrame.iY + m_cBoxFrameTitleRel.iHeight;
@@ -1181,20 +1180,22 @@ void CMovieBrowser::refreshMovieInfo(void)
int divx = 720/m_cBoxFrameInfo.iHeight;
int picw = 720/divx;
int pich = 576/divx;
#ifndef FB_USE_PALETTE
std::string fname = m_movieSelectionHandler->file.Name;
strReplace(fname, ".ts", ".bmp");
//printf("screenshot name: %s\n", fname.c_str());
logo_ok = !access(fname.c_str(), F_OK);
#endif
m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, logo_ok ? m_cBoxFrameInfo.iWidth-picw-20: 0);
#ifndef FB_USE_PALETTE
//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgEpgId, m_movieSelectionHandler->epgId, m_cBoxFrameTitleRel.iY);
int lx = m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-PIC_W-10;
int ly = m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-PIC_H)/2;
m_pcWindow->paintBoxRel(lx, ly, PIC_W, PIC_H, TITLE_BACKGROUND_COLOR);
g_PicViewer->DisplayLogo(m_movieSelectionHandler->epgEpgId >>16, lx, ly, PIC_W, PIC_H);
//g_PicViewer->DisplayLogo(m_movieSelectionHandler->epgEpgId >>16, lx, ly, PIC_W, PIC_H);
std::string lname;
if(g_PicViewer->GetLogoName(m_movieSelectionHandler->epgEpgId >>16, m_movieSelectionHandler->epgChannel, lname))
g_PicViewer->DisplayImage(lname, lx, ly, PIC_W, PIC_H);
if(logo_ok) {
#if 0
lx = m_cBoxFrameInfo.iX+m_cBoxFrameInfo.iWidth - picw -10;
@@ -1209,7 +1210,6 @@ void CMovieBrowser::refreshMovieInfo(void)
m_pcWindow->paintHLineRel(lx, picw, ly+pich, COL_WHITE);
g_PicViewer->DisplayImage(fname, lx+3, ly+3, picw-3, pich-3);
}
#endif
}
}