[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-239-gb0d16a5
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-239-gb0d16a5
|
From: Thilo G. <tux...@ne...> - 2013-09-19 08:02:48
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via b0d16a5af89815a4de0478a20b356abb2c0f0534 (commit)
via 53088f164b4873c57104ec437cd847b528336690 (commit)
via 25ae510f8eb532311b27e95f737221ced4be96c8 (commit)
from 70b73286b2cb14b6609589b38a5c65bb0407b84c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b0d16a5af89815a4de0478a20b356abb2c0f0534
Author: Christian Schuett <Gau...@ho...>
Date: Wed Sep 18 22:45:27 2013 +0200
Neutrino channel list: mark current channel if not selected
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 6e08f55..82d3189 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -266,7 +266,9 @@ CChannelList::CChannel* CChannelList::getChannel( int number)
int CChannelList::getKey(int id)
{
- return chanlist[id]->key;
+ if (id > -1 && id < (int)chanlist.size())
+ return chanlist[id]->key;
+ return 0;
}
static const std::string empty_string;
@@ -275,29 +277,28 @@ const std::string & CChannelList::getActiveChannelName(void) const
{
if (selected < chanlist.size())
return chanlist[selected]->name;
- else
- return empty_string;
+ return empty_string;
}
t_satellite_position CChannelList::getActiveSatellitePosition(void) const
{
if (selected < chanlist.size())
return chanlist[selected]->satellitePosition;
- else
- return 0;
+ return 0;
}
t_channel_id CChannelList::getActiveChannel_ChannelID(void) const
{
if (selected < chanlist.size())
return chanlist[selected]->channel_id;
- else
- return 0;
+ return 0;
}
int CChannelList::getActiveChannelNumber(void) const
{
- return (selected + 1);
+ if (selected < chanlist.size())
+ return chanlist[selected]->number;
+ return 0;
}
void CChannelList::updateSelection(unsigned int newpos)
@@ -1299,6 +1300,12 @@ void CChannelList::paintItem(int pos)
paintItem2DetailsLine(pos);
c_rad_small = RADIUS_SMALL;
}
+ else if (getKey(curr) == CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber())
+ {
+ color = !displayNext ? COL_MENUCONTENT + 1 : COL_MENUCONTENTINACTIVE;
+ bgcolor = !displayNext ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENTINACTIVE_PLUS_0;
+ c_rad_small = RADIUS_SMALL;
+ }
else
{
color = !displayNext ? COL_MENUCONTENT : COL_MENUCONTENTINACTIVE;
commit 53088f164b4873c57104ec437cd847b528336690
Author: Christian Schuett <Gau...@ho...>
Date: Wed Sep 18 19:21:58 2013 +0200
Neutrino channel list: format satellite position in details box
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 81ee4d8..6e08f55 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1193,17 +1193,11 @@ void CChannelList::paintDetails(unsigned int index)
if (g_info.delivery_system == DVB_S)
{
- char sstr[20];
- for (CZapitClient::SatelliteList::const_iterator satList_it = satList.begin(); satList_it != satList.end(); ++satList_it)
- {
- if (satList_it->satPosition == getActiveSatellitePosition())
- {
- snprintf(sstr, 19, "%d", satList_it->satPosition);
- sstr[19] = '\0';
- break;
- }
- }
- desc = desc + " (" + sstr + ")";
+ int satpos = getActiveSatellitePosition();
+ char satpos_str[6];
+ snprintf(satpos_str, 5, "%d.%d%c", satpos < 0 ? -satpos / 10 : satpos / 10, satpos < 0 ? -satpos % 10 : satpos % 10, satpos < 0 ? 'W' : 'E');
+ satpos_str[5] = '\0';
+ desc = desc + " (" + satpos_str + ")";
}
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, full_width - 30, desc.c_str(), COL_MENUCONTENTDARK, 0, true);
commit 25ae510f8eb532311b27e95f737221ced4be96c8
Author: GetAway <get...@t-...>
Date: Fri Sep 13 16:23:16 2013 +0200
shellexec: add parameter MENUTIMEOUT
readme.txt contains information
diff --git a/tuxbox/plugins/shellexec/readme.txt b/tuxbox/plugins/shellexec/readme.txt
index 526d561..7289020 100644
--- a/tuxbox/plugins/shellexec/readme.txt
+++ b/tuxbox/plugins/shellexec/readme.txt
@@ -84,6 +84,16 @@ Wurde der Eintrag "FONT=" bereits weggelassen, sollte auch dieser Eintrag nicht
verwendet werden, damit das Plugin den zum "pakenham.ttf" passenden Wert von 30
verwendet.
+Mit der Angabe
+
+MENUTIMEOUT=
+
+kann das MENÃ-Timeout von z.Z. 60 Sek., das aus der neutrino.conf(timing.menu)
+ausgelesen wird, überschrieben werden. Der Wert 0 schaltet das Timeout für das
+FlexMenü aus. Es wird dann solange angezeigt, bis der Home-Button gedrückt wird.
+120 Sekunden werden gesetzt, wenn neutrino.conf fehlt oder nicht gelesen werden
+kann und keine Angabe mit MENUTIMEOUT gemacht wurde.
+
Der Eintrag
PAGING=1
diff --git a/tuxbox/plugins/shellexec/shellexec.c b/tuxbox/plugins/shellexec/shellexec.c
index e2bce11..374a85b 100644
--- a/tuxbox/plugins/shellexec/shellexec.c
+++ b/tuxbox/plugins/shellexec/shellexec.c
@@ -42,7 +42,7 @@ static char CFG_FILE[128]="/var/tuxbox/config/shellexec.conf";
#define LCD_CPL 12
#define LCD_RDIST 10
-#define SH_VERSION 2.56
+#define SH_VERSION 2.57
typedef struct {int fnum; FILE *fh[16];} FSTRUCT, *PFSTRUCT;
static int direct[32];
@@ -472,6 +472,10 @@ FSTRUCT fstr;
FSIZE_BIG=(FSIZE_MED*5)/4;
FSIZE_SMALL=(FSIZE_MED*4)/5;
}
+ if(strstr(line_buffer,"MENUTIMEOUT=")==line_buffer)
+ {
+ sscanf(strchr(line_buffer,'=')+1,"%d",&mtmo);
+ }
if(strstr(line_buffer,"PAGING=")==line_buffer)
{
sscanf(strchr(line_buffer,'=')+1,"%d",&paging);
@@ -907,6 +911,8 @@ time_t tm1,tm2;
case -1:
knew=0;
+ if (mtmo == 0)
+ break;
time(&tm2);
//printf("TLeft: %3d\r",mtmo-(tm2-tm1));
if((tm2-tm1)<mtmo)
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/channellist.cpp | 39 ++++++++++++++++---------------
tuxbox/plugins/shellexec/readme.txt | 10 ++++++++
tuxbox/plugins/shellexec/shellexec.c | 8 +++++-
3 files changed, 37 insertions(+), 20 deletions(-)
--
Tuxbox-GIT: apps
|
