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

minor alignments to cst-git; no binary changes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 750c779f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- minor alignments to cst-git; no binary changes

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-21 22:21:08 +02:00
parent fb01ee52e2
commit 337c67cd28
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/framebuffer.cpp
View File

@@ -387,6 +387,7 @@ nolfb:
void CFrameBuffer::clearIconCache()
{
std::map<std::string, rawIcon>::iterator it;
for(it = icon_cache.begin(); it != icon_cache.end(); ++it) {
/* printf("FB: delete cached icon %s: %x\n", it->first.c_str(), (int) it->second.data); */
cs_free_uncached(it->second.data);
@@ -2001,6 +2002,7 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32
_write_gxa(gxa_base, GXA_BMP1_TYPE_REG, (3 << 16) | width);
_write_gxa(gxa_base, GXA_BMP1_ADDR_REG, (unsigned int) uKva);
_write_gxa(gxa_base, cmd, GXA_POINT(xoff, yoff)); /* destination pos */
_write_gxa(gxa_base, cmd, GXA_POINT(xc, yc)); /* source width, FIXME real or adjusted xc, yc ? */
_write_gxa(gxa_base, cmd, GXA_POINT(xp, yp)); /* source pos */

2
src/gui/Makefile.am
View File

@@ -8,7 +8,7 @@ version.h:
pushd $(top_srcdir) ; \
GITTAG=$$(git tag -l "NI-*" | tail -n1); \
GITBRANCH=$$(git rev-parse --abbrev-ref HEAD) ; \
GITDESCRIBE=$$(git describe --always --dirty --tags --match $$GITTAG || echo 'VCS failed') ; \
GITDESCRIBE=$$(git describe --always --tags --dirty --match $$GITTAG || echo 'VCS failed') ; \
popd ; \
echo '#define VCS "'$${GITDESCRIBE} [$${GITBRANCH}]'"' >> $@ ; \
fi

1
src/gui/components/cc_item_progressbar.cpp
View File

@@ -471,6 +471,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
//progress
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.progressbar_timescale_invert);
if (cc_allow_paint){
if (!is_painted || (pb_active_width != pb_last_width)) {
//NI start

2
src/gui/dboxinfo.cpp
View File

@@ -456,13 +456,11 @@ void CDBoxInfoWidget::paint()
unsigned int h = cpuload_y1 - cpuload_y0;
cpuload_y0 += y;
cpuload_y1 += y;
//NI frameBuffer->paintBoxRel(x + offsetw, cpuload_y0, pbw, h, COL_MENUCONTENT_PLUS_2);
frameBuffer->paintBoxRel(x + offsetw, cpuload_y0, pbw, h, COL_MENUHEAD_PLUS_0); //NI
int off = std::max(0, (int)sysload->data_avail - pbw);
for (unsigned int i = 0; i < sysload->data_avail - off; i++) {
if ((sysload->data[i + off] * h / 1000) > 0)
//NI frameBuffer->paintVLine(x+offsetw + i, cpuload_y1 - sysload->data[i + off] * h / 1000, cpuload_y1, COL_MENUCONTENT_PLUS_7);
frameBuffer->paintVLine(x+offsetw + i, cpuload_y1 - sysload->data[i + off] * h / 1000, cpuload_y1, COL_MENUHEAD_TEXT); //NI
}
}

7
src/gui/epgview.cpp
View File

@@ -205,7 +205,6 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove
// check the wordwidth - add to this line if size ok
int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord);
//NI if ((aktWordWidth+aktWidth)<(ox - 20 - 15 - (has_cover? (std::min((sb-10)*342/513,342)) :0)))
if ((aktWordWidth+aktWidth)<(ox - 20 - 15 - (has_cover? (std::min((sb-10)*342/513,342)) : poster_offset))) //NI IMDb
{//space ok, add
aktWidth += aktWordWidth;
@@ -274,8 +273,8 @@ void CEpgData::showText(int startPos, int ypos, bool cover, bool fullClear)
if (cover) {
if (!g_PicViewer->DisplayImage("/tmp/tmdb.jpg",sx+3,y+3+((sb-cover_height)/2),cover_width,cover_height, CFrameBuffer::TM_NONE)) {
//NI cover_offset = 0;
cover_offset = poster_offset = 0; //NI
cover_offset = 0;
poster_offset = 0; //NI
frameBuffer->paintBoxRel(sx, y, ox-15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box
}
}
@@ -320,7 +319,6 @@ void CEpgData::showText(int startPos, int ypos, bool cover, bool fullClear)
count = 0;
}
else{
//NI g_Font[( i< info1_lines ) ?SNeutrinoSettings::FONT_TYPE_EPG_INFO1:SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+10+cover_offset, y+medlineheight, ox- 15- 15, epgText[i].first, COL_MENUCONTENT_TEXT);
g_Font[( i< info1_lines ) ?SNeutrinoSettings::FONT_TYPE_EPG_INFO1:SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+10+poster_offset, y+medlineheight, ox- 15- 15 -poster_offset, epgText[i].first, COL_MENUCONTENT_TEXT); //NI IMDb
}
}
@@ -1322,7 +1320,6 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
// -- 2002-05-13 rasc
//
//NI const struct button_label EpgButtons[] =
struct button_label EpgButtons[] = //NI
{
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_TIMERBAR_RECORDEVENT },

1
src/gui/info_menue.cpp
View File

@@ -40,6 +40,7 @@
#include <gui/imageinfo_ni.h> //NI
#include <gui/dboxinfo.h>
#include <gui/streaminfo2.h>
#if 0
#include <gui/buildinfo.h>
#endif