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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-26 22:51:16 +02:00
parent 93a5f2ab06 5a33e3eebf
commit 144725ebcd
6 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -58,6 +58,10 @@ fb_pixel_t *getFBp(int *y)
void FillRect(int x, int y, int w, int h, int color) void FillRect(int x, int y, int w, int h, int color)
{ {
if(color < 0 || SIZECOLTABLE < color){
printf("FIXME array size %i color %i not in range\n",SIZECOLTABLE,color);
return;
}
fb_pixel_t *p = getFBp(&y); fb_pixel_t *p = getFBp(&y);
MARK_FB(x, y, w, h); MARK_FB(x, y, w, h);
p += x + y * stride; p += x + y * stride;

2
src/gui/record_setup.cpp
View File

@@ -318,7 +318,7 @@ int CRecordSetup::showRecordSetup()
void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings) void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)
{ {
//recording start/end correcture //recording start/end correcture
int pre,post; int pre = 0,post = 0;
g_Timerd->getRecordingSafety(pre,post); g_Timerd->getRecordingSafety(pre,post);
g_settings.record_safety_time_before = pre/60; g_settings.record_safety_time_before = pre/60;
g_settings.record_safety_time_after = post/60; g_settings.record_safety_time_after = post/60;

2
src/gui/timerlist.cpp
View File

@@ -442,7 +442,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
} }
else if ((strcmp(key, "send_remotetimer") == 0) && RemoteBoxChanExists(timerlist[selected].channel_id)) else if ((strcmp(key, "send_remotetimer") == 0) && RemoteBoxChanExists(timerlist[selected].channel_id))
{ {
int pre,post; int pre = 0,post = 0;
Timer->getRecordingSafety(pre,post); Timer->getRecordingSafety(pre,post);
CHTTPTool httpTool; CHTTPTool httpTool;
std::string r_url; std::string r_url;

1
src/gui/widget/progresswindow.cpp
View File

@@ -122,6 +122,7 @@ CProgressBar* CProgressWindow::getProgressItem()
pBar->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0); pBar->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
pBar->setFrameThickness(1); pBar->setFrameThickness(1);
pBar->setColorFrame(COL_PROGRESSBAR_ACTIVE_PLUS_0); pBar->setColorFrame(COL_PROGRESSBAR_ACTIVE_PLUS_0);
pBar->setType(CProgressBar::PB_TIMESCALE);
addWindowItem(pBar); addWindowItem(pBar);
return pBar; return pBar;

2
src/timerd/timerd.cpp
View File

@@ -308,7 +308,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo)); CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo));
if(recInfo.recordingSafety) if(recInfo.recordingSafety)
{ {
int pre,post; int pre = 0,post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre,post); CTimerManager::getInstance()->getRecordingSafety(pre,post);
msgAddTimer.announceTime -= pre; msgAddTimer.announceTime -= pre;
msgAddTimer.alarmTime -= pre; msgAddTimer.alarmTime -= pre;

2
src/timerd/timermanager.cpp
View File

@@ -1359,7 +1359,7 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
CChannelEventList evtlist; CChannelEventList evtlist;
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist); CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
int pre, post; int pre = 0, post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre, post); CTimerManager::getInstance()->getRecordingSafety(pre, post);
time_t _announceTime = announceTime; time_t _announceTime = announceTime;