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

Merge branch 'pu/mp' into 'master'

Browse Source
This commit is contained in:
Thilo Graf
2017-10-17 20:05:05 +02:00
parent acf9cdfea8 306c52642d
commit ccb19a8880
170 changed files with 6283 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_frm.cpp
View File

@@ -248,7 +248,7 @@ int CComponentsForm::genIndex()
CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id)
{
if (cc_item_id >= size()){
dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] Error: parameter cc_item_id = %u, out of range (size = %" PRIx32")...\n", __func__, __LINE__, cc_item_id, size());
dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] Error: parameter cc_item_id = %u, out of range (size = %zx)...\n", __func__, __LINE__, cc_item_id, size());
return NULL;
}
@@ -575,7 +575,7 @@ void CComponentsForm::setSelectedItem(int item_id, const fb_pixel_t& sel_frame_c
int id = item_id;
if (id > (int)(count-1) || id < 0 || (count == 0)){
dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] invalid parameter item_id = %u, available items = %u, allowed values are: 0...%u! \n", __func__,
dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] invalid parameter item_id = %u, available items = %zu, allowed values are: 0...%zu! \n", __func__,
__LINE__,
item_id,
count,

2
src/gui/components/cc_frm_header.cpp
View File

@@ -422,7 +422,7 @@ void CComponentsHeader::addContextButton(const int& buttons)
void CComponentsHeader::removeContextButtons()
{
dprintf(DEBUG_DEBUG, "[CComponentsHeader]\t [%s - %d] removing %u context buttons...\n", __func__, __LINE__, v_cch_btn.size());
dprintf(DEBUG_DEBUG, "[CComponentsHeader]\t [%s - %d] removing %zu context buttons...\n", __func__, __LINE__, v_cch_btn.size());
v_cch_btn.clear();
if (cch_btn_obj)
cch_btn_obj->clear();

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

@@ -248,6 +248,7 @@ void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_pas
ap += pbc_passive_width;
p += off;
}
frameBuffer->mark(x, y, x + pbc_width, y + pbc_height);
}
void CProgressBarCache::pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col) const