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

Merge branch 'check/next-cc'

Browse Source 
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-30 20:17:31 +01:00
parent f153dcbd1e 2b6a033d8e
commit ea50f5f7bc
83 changed files with 913 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui/infoviewer_bb.cpp
View File

@@ -52,6 +52,7 @@
#include <gui/movieplayer.h>
#include <system/helpers.h>
#include <daemonc/remotecontrol.h>
#include <driver/radiotext.h>
#include <driver/volume.h>
#include <zapit/femanager.h>
@@ -62,7 +63,6 @@
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern cVideo * videoDecoder;
//#define SHOW_RADIOTEXT_ICON
#define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1)
CInfoViewerBB::CInfoViewerBB()
@@ -90,6 +90,8 @@ CInfoViewerBB::CInfoViewerBB()
bbIconInfo[0].h = 0;
BBarY = 0;
BBarFontY = 0;
hddscale = NULL;
sysscale = NULL;
Init();
}
@@ -162,7 +164,7 @@ void CInfoViewerBB::getBBIconInfo()
bbIconMaxH = 0;
BBarY = g_InfoViewer->BoxEndY + bottom_bar_offset;
BBarFontY = BBarY + InfoHeightY_Info - (InfoHeightY_Info - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()) / 2; /* center in buttonbar */
bbIconMinX = g_InfoViewer->BoxEndX;
bbIconMinX = g_InfoViewer->BoxEndX - 8; //should be 10px, but 2px will be reduced for each icon
CNeutrinoApp* neutrino = CNeutrinoApp::getInstance();
for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) {
@@ -177,12 +179,10 @@ void CInfoViewerBB::getBBIconInfo()
if (neutrino->getMode() != NeutrinoMessages::mode_radio)
iconView = checkBBIcon(NEUTRINO_ICON_VTXT, &w, &h);
break;
#ifdef SHOW_RADIOTEXT_ICON
case CInfoViewerBB::ICON_RT:
if (neutrino->getMode() == NeutrinoMessages::mode_radio)
iconView = checkBBIcon(NEUTRINO_ICON_RT, &w, &h);
if ((neutrino->getMode() == NeutrinoMessages::mode_radio) && g_settings.radiotext_enable)
iconView = checkBBIcon(NEUTRINO_ICON_RADIOTEXTGET, &w, &h);
break;
#endif
case CInfoViewerBB::ICON_DD:
if( g_settings.infobar_show_dd_available )
iconView = checkBBIcon(NEUTRINO_ICON_DD, &w, &h);
@@ -482,22 +482,19 @@ void CInfoViewerBB::showIcon_DD()
showBBIcons(CInfoViewerBB::ICON_DD, dd_icon);
}
#ifdef SHOW_RADIOTEXT_ICON
void CInfoViewerBB::showIcon_RadioText(bool rt_available)
{
// TODO: display radiotext icon
if ((showButtonBar) && (is_visible))
{
int mode = CNeutrinoApp::getInstance()->getMode();
if (!is_visible || !g_settings.radiotext_enable)
return;
showBBIcons(CInfoViewerBB::ICON_RT, rt_icon);
}
std::string rt_icon;
if (rt_available)
rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXTGET : NEUTRINO_ICON_RADIOTEXTWAIT;
else
rt_icon = NEUTRINO_ICON_RADIOTEXTOFF;
showBBIcons(CInfoViewerBB::ICON_RT, rt_icon);
}
#else
void CInfoViewerBB::showIcon_RadioText(bool /*rt_available*/)
{
}
#endif
void CInfoViewerBB::showIcon_16_9()
{
@@ -690,7 +687,7 @@ void CInfoViewerBB::showBarHdd(int percent)
void CInfoViewerBB::paint_ca_icons(int caid, char * icon, int &icon_space_offset)
{
char buf[20];
int endx = g_InfoViewer->BoxEndX -3;
int endx = g_InfoViewer->BoxEndX - 10;
int py = g_InfoViewer->BoxEndY + 2; /* hand-crafted, should be automatic */
int px = 0;
static map<int, std::pair<int,const char*> > icon_map;