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

Merge remote-tracking branch 'neutrino-mp/master' into pu/mp

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
This commit is contained in:
svenhoefer
2017-03-13 16:14:33 +01:00
parent 5b0faeab8c 40adaa6515
commit 8bdb16cec6
181 changed files with 6320 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,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;
}
@@ -560,7 +560,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,

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

@@ -183,7 +183,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_cc * const con
//ignore item, if no text and icon are defined;
if (txt.empty() && icon_name.empty()){
dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] ignore item [%d], no icon and text defined!\n", __func__, __LINE__, i);
dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] ignore item [%zu], no icon and text defined!\n", __func__, __LINE__, i);
continue;
}
@@ -219,7 +219,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_cc * const con
btn->setButtonFont(NULL);
}
dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] button %s [%u] btn->getWidth() = %d w_btn = %d, (chain->getWidth() = %d)\n", __func__, __LINE__, txt.c_str(), i, btn->getWidth(), w_btn, chain->getWidth());
dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] button %s [%zu] btn->getWidth() = %d w_btn = %d, (chain->getWidth() = %d)\n", __func__, __LINE__, txt.c_str(), i, btn->getWidth(), w_btn, chain->getWidth());
}
/* add generated button objects to chain object.

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

@@ -316,7 +316,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

@@ -247,6 +247,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)