mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +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
This commit is contained in:
focus
2010-02-05 15:26:57 +00:00
parent 2f6462c65d
commit 3fb6607ba0
16 changed files with 498 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gui/infoviewer.cpp
View File

@@ -518,16 +518,7 @@ fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_set
sprintf (strChanNum, "%d", ChanNum);
int ChanNumWidth = 0;
#if 0
if (showButtonBar) {
#define PIC_W 52
#define PIC_H 39
#define PIC_X (ChanNameX + 10)
#define PIC_Y (ChanNameY + time_height - PIC_H)
logo_ok = g_PicViewer->DisplayLogo(channel_id, PIC_X, PIC_Y, PIC_W, PIC_H);
ChanNumWidth = PIC_W + 10;
}
#endif
if (ChanNum) /* !fileplay */
{
/* TODO: the logic will get much easier once we decouple channellogo and signal bars */
@@ -1605,12 +1596,6 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id)
if (!g_settings.infobar_show_channellogo) // show logo only if configured
return 0;
char strChanId[16];
sprintf(strChanId, "%llx", logo_channel_id & 0xFFFFFFFFFFFFULL);
/* first the channel-id, then the channelname */
std::string strLogoName[2] = { (std::string)strChanId, ChannelName };
/* first jpg, then gif */
std::string strLogoExt[2] = { ".jpg", ".gif" };
std::string strAbsIconPath;
int x_mid, y_mid, logo_w, logo_h;
@@ -1619,37 +1604,13 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id)
int start_x = ChanNameX;
int chan_w = BoxEndX- (start_x+ 20)- time_width- 15;
bool logo_available = false;
int i, j;
bool logo_available = g_PicViewer->GetLogoName(logo_channel_id, ChannelName, strAbsIconPath, &logo_w, &logo_h);
// check if logo is available
for (i = 0; i < 2; i++)
{
for (j = 0; j < 2; j++)
{
std::string tmp(LOGO_DIR2 "/" + strLogoName[i] + strLogoExt[j]);
//fprintf(stderr, "%s: checking for '%s'...", __FUNCTION__, tmp.c_str());
if (access(tmp.c_str(), R_OK) != -1)
{
//fprintf(stderr, "ok!\n");
strAbsIconPath = tmp;
logo_available = true;
break;
}
//fprintf(stderr, "failed\n");
}
if (logo_available)
break;
}
fprintf(stderr, "%s: logo_available: %d file: %s\n", __FUNCTION__, logo_available, strAbsIconPath.c_str());
//fprintf(stderr, "%s: logo_available: %d file: %s\n", __FUNCTION__, logo_available, strAbsIconPath.c_str());
if (! logo_available)
return 0;
// get logo sizes
logo_w = g_PicViewer->getWidth(strAbsIconPath.c_str());
logo_h = g_PicViewer->getHeight(strAbsIconPath.c_str());
if ((logo_w == 0) || (logo_h == 0)) // corrupt logo size?
{
printf("[infoviewer] channel logo: \n"