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

varius fixes

Browse Source
This commit is contained in:
TangoCash
2016-10-21 10:47:37 +02:00
committed by svenhoefer
parent f354089763
commit fb26f93d98
2 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/timerdclient/timerdtypes.h
View File

@@ -162,7 +162,7 @@ class CTimerd
char pluginName[EXEC_PLUGIN_NAME_MAXLEN]; //only filled if applicable
char recordingDir[RECORD_DIR_MAXLEN]; //only filled if applicable
char epgTitle[EPG_TITLE_MAXLEN]; //only filled if applicable
char remotebox_ip[15];
char remotebox_ip[16];
int rem_pre;
int rem_post;

89
src/gui/timerlist.cpp
View File

@@ -575,7 +575,8 @@ void CTimerList::select_remotebox_ip()
{
if (g_settings.timer_remotebox_ip.size() == 1) {
std::list<std::string>::iterator it = g_settings.timer_remotebox_ip.begin();
strncpy(timerlist[selected].remotebox_ip,it->c_str(),15);
strncpy(timerlist[selected].remotebox_ip,it->c_str(),sizeof(timerlist[selected].remotebox_ip));
timerlist[selected].remotebox_ip[sizeof(timerlist[selected].remotebox_ip) - 1] = 0;
}
int select = 0;
@@ -591,7 +592,8 @@ void CTimerList::select_remotebox_ip()
std::list<std::string>::iterator it = g_settings.timer_remotebox_ip.begin();
std::advance(it,select);
strncpy(timerlist[selected].remotebox_ip,it->c_str(),15);
strncpy(timerlist[selected].remotebox_ip,it->c_str(),sizeof(timerlist[selected].remotebox_ip));
timerlist[selected].remotebox_ip[sizeof(timerlist[selected].remotebox_ip) - 1] = 0;
}
bool CTimerList::remoteChanExists(t_channel_id channel_id)
@@ -613,6 +615,11 @@ bool CTimerList::remoteChanExists(t_channel_id channel_id)
}
r_url = root.get("success","false").asString();
if (r_url == "false")
ShowMsg(LOCALE_STREAMINFO_NOT_AVAILABLE, convertChannelId2String(channel_id),
CMessageBox::mbrOk, CMessageBox::mbOk, NULL, 450, 30, false);
return (r_url == "true");
}
@@ -659,7 +666,8 @@ void CTimerList::remoteTimerList(CTimerd::TimerList &rtimerlist)
for (unsigned int i= 0; i<remotetimers.size();i++) {
CTimerd::responseGetTimer rtimer;
if ( atoi(remotetimers[i].get("type_number","").asString()) == 5) {
strncpy(rtimer.remotebox_ip,it->c_str(),15);
strncpy(rtimer.remotebox_ip,it->c_str(),sizeof(rtimer.remotebox_ip));
rtimer.remotebox_ip[sizeof(rtimer.remotebox_ip) - 1] = 0;
rtimer.rem_pre = rem_pre;
rtimer.rem_post = rem_post;
rtimer.eventID = atoi(remotetimers[i].get("id","").asString());
@@ -788,6 +796,13 @@ int CTimerList::show()
}
else if ((msg == CRCInput::RC_red) && !(timerlist.empty()))
{
if ((timerlist[selected].eventType == CTimerd::TIMER_REMOTEBOX) && (timerlist[selected].eventState < CTimerd::TIMERSTATE_ISRUNNING)) {
if (exec(this,"del_remotetimer"))
{
res=menu_return::RETURN_EXIT_ALL;
loop=false;
}
} else {
bool killTimer = true;
if (CRecordManager::getInstance()->RecordingStatus(timerlist[selected].channel_id)) {
CTimerd::RecordingStopInfo recinfo;
@@ -810,17 +825,11 @@ int CTimerList::show()
}
}
if (killTimer) {
if ((timerlist[selected].eventType == CTimerd::TIMER_REMOTEBOX) && (timerlist[selected].eventState < CTimerd::TIMERSTATE_ISRUNNING))
if (exec(this,"del_remotetimer"))
{
res=menu_return::RETURN_EXIT_ALL;
loop=false;
}
else
Timer->removeTimerEvent(timerlist[selected].eventID);
update = true;
}
}
}
else if (msg==CRCInput::RC_green)
{
if (newTimer()==menu_return::RETURN_EXIT_ALL)
@@ -991,13 +1000,20 @@ void CTimerList::paintItem(int pos)
}
}
if ((timer.eventType == CTimerd::TIMER_REMOTEBOX) && timer.eventState == CTimerd::TIMERSTATE_ISRUNNING) {
int icol_w, icol_h;
frameBuffer->getIconSize(NEUTRINO_ICON_REC, &icol_w, &icol_h);
if ((icol_w > 0) && (icol_h > 0)) {
frameBuffer->paintIcon(NEUTRINO_ICON_REC, (x + real_width) - (icol_w + 8), ypos, 2*fheight);
}
}
std::string zAddData("");
switch (timer.eventType)
{
//case CTimerd::TIMER_NEXTPROGRAM :
case CTimerd::TIMER_ZAPTO :
case CTimerd::TIMER_RECORD :
case CTimerd::TIMER_REMOTEBOX :
{
zAddData = convertChannelId2String(timer.channel_id); // UTF-8
if (timer.apids != TIMERD_APIDS_CONF)
@@ -1044,6 +1060,57 @@ void CTimerList::paintItem(int pos)
}
}
break;
case CTimerd::TIMER_REMOTEBOX :
{
CHTTPTool httpTool;
std::string r_url;
r_url = "http://";
r_url += std::string(timer.remotebox_ip);
r_url += "/control/getchannel?format=json&id=";
r_url += string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer.channel_id);
r_url = httpTool.downloadString(r_url);
Json::Value root;
Json::Reader reader;
bool parsedSuccess = reader.parse(r_url, root, false);
if (!parsedSuccess) {
printf("Failed to parse JSON\n");
printf("%s\n", reader.getFormattedErrorMessages().c_str());
}
Json::Value remotechannel = root["data"]["channel"][0];
zAddData = remotechannel.get("name","").asString();
if (timer.apids != TIMERD_APIDS_CONF)
{
std::string sep = "";
zAddData += " (";
if (timer.apids & TIMERD_APIDS_STD)
{
zAddData += "STD";
sep = "/";
}
if (timer.apids & TIMERD_APIDS_ALT)
{
zAddData += sep;
zAddData += "ALT";
sep = "/";
}
if (timer.apids & TIMERD_APIDS_AC3)
{
zAddData += sep;
zAddData += "AC3";
// sep = "/";
}
zAddData += ')';
}
if (strlen(timer.epgTitle)!=0)
{
zAddData += " : ";
zAddData += timer.epgTitle;
}
}
break;
case CTimerd::TIMER_STANDBY:
{
zAddData = g_Locale->getText(timer.standby_on ? LOCALE_TIMERLIST_STANDBY_ON : LOCALE_TIMERLIST_STANDBY_OFF);