[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-222-gf9ae6bc
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-222-gf9ae6bc
|
From: Thilo G. <tux...@ne...> - 2013-08-08 14:11:05
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via f9ae6bced89a6c856507141072ae4e9700ab14c5 (commit)
via 4c11160dbd4ad136e3b6e4d46ca5feab2a805210 (commit)
via 5f12efedb20aca25e63f3483faf97efecb137905 (commit)
via 3093a9f6daedc7cfc0eb2be27c1a02f8e0b27612 (commit)
via 4f2bf6c6a65575ec429065f358fd5cf5bf6831b9 (commit)
via fecd6a6e72121df43a80b42b87edd2608fbe342d (commit)
via 7b9fe4c296c9f56e84e78ce3ebd2d69427110169 (commit)
via 73590e667d2b2e7f196b497b9e2fee032f0d92d8 (commit)
via 1bafbcabc9d67c86acd4178187f8a4e1ad93af07 (commit)
via b834a5a65e6eb5a2752fa3e8954c9c04d6f3db6d (commit)
via 3f8c798027c79fe2bbe191117faef78873377b37 (commit)
via f0b7d2a1bacf38a978b175c6251eafe30c832eb6 (commit)
via 07d6b10a3f055ab2230628878beb61c799cd4ad1 (commit)
via 8327a2a566daf66761b19cb7794e01a64678d005 (commit)
via 694e186ffdb5aa62fbef44d5a7e62702edf5e43d (commit)
via f5e16560ba1d4cea50794e3b3da17ceacf637db3 (commit)
via 9241ea2b6fb01b08a8b59b45268ceca004674a97 (commit)
via bb0321e2c068d9575b099c9fd71b362a1eb743c6 (commit)
via 0146883b8270a54e7f23e0370a12029d95c432d7 (commit)
via cf4e20f99f611e4e3af05c89a13a3ddf833ed4ec (commit)
from 748ac5faf482b3a475f75530f972074d8e724bad (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 f9ae6bced89a6c856507141072ae4e9700ab14c5
Author: Christian Schuett <Gau...@ho...>
Date: Wed Aug 7 20:43:09 2013 +0200
yWeb: add PMT and PCR PID to streaminfo
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_StreamInfo.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_StreamInfo.yhtm
index 4c42162..bf13c8b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_StreamInfo.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_StreamInfo.yhtm
@@ -71,6 +71,16 @@
<TD class="set"> <div align="left">{=tsfrequency=} ({=polarisation=})</div></TD>
</TR>
<TR>
+<TD class="set"><B>pmtpid:</B></TD>
+<TD> </TD>
+<TD class="set"> <div align="left">{=pmtpid=}</div></TD>
+</TR>
+<TR>
+<TD class="set"><B>pcrpid:</B></TD>
+<TD> </TD>
+<TD class="set"> <div align="left">{=pcrpid=}</div></TD>
+</TR>
+<TR>
<TD class="set"><B>vpid:</B></TD>
<TD> </TD>
<TD class="set"> <div align="left">{=vpid=}</div></TD>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index a5fa020..89a579f 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,5 +1,5 @@
-version=2.7.0.27
-date=24.04.2013
+version=2.7.0.28
+date=07.08.2013
type=Release
info=
commit 4c11160dbd4ad136e3b6e4d46ca5feab2a805210
Author: Christian Schuett <Gau...@ho...>
Date: Wed Aug 7 19:51:40 2013 +0200
nhttpd controlapi: add charset iso-8859-1 to response header
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index d783e48..2b70340 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -225,11 +225,11 @@ void CControlAPI::Execute(CyhookHandler *hh)
;
else if(std::string(yCgiCallList[index].mime_type) == "+xml") // Parameter xml?
if (hh->ParamList["xml"] != "")
- hh->SetHeader(HTTP_OK, "text/xml");
+ hh->SetHeader(HTTP_OK, "text/xml; charset=iso-8859-1");
else
- hh->SetHeader(HTTP_OK, "text/html");
+ hh->SetHeader(HTTP_OK, "text/html; charset=iso-8859-1");
else
- hh->SetHeader(HTTP_OK, yCgiCallList[index].mime_type);
+ hh->SetHeader(HTTP_OK, std::string(yCgiCallList[index].mime_type) + "; charset=iso-8859-1");
// response
hh->status = HANDLED_READY;
if (hh->Method == M_HEAD) // HEAD or function call
@@ -348,11 +348,11 @@ void CControlAPI::ExecCGI(CyhookHandler *hh)
std::string script, result;
// override standard header
if (hh->ParamList.size() > 1 && hh->ParamList["xml"].empty())
- hh->SetHeader(HTTP_OK, "text/html");
+ hh->SetHeader(HTTP_OK, "text/html; charset=iso-8859-1");
else if (hh->ParamList.size() > 1 && !hh->ParamList["xml"].empty())
- hh->SetHeader(HTTP_OK, "text/xml");
+ hh->SetHeader(HTTP_OK, "text/xml; charset=iso-8859-1");
else
- hh->SetHeader(HTTP_OK, "text/plain");
+ hh->SetHeader(HTTP_OK, "text/plain; charset=iso-8859-1");
if (!hh->ParamList.empty())
{
script = hh->ParamList["1"];
@@ -1068,7 +1068,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
if (hh->ParamList.empty())
{
- hh->SetHeader(HTTP_OK, "text/plain");
+ hh->SetHeader(HTTP_OK, "text/plain; charset=iso-8859-1");
CZapitClient::BouquetChannelList *channellist = NeutrinoAPI->GetChannelList(CZapitClient::MODE_CURRENT);
CZapitClient::BouquetChannelList::iterator channel = channellist->begin();
for(; channel != channellist->end();channel++)
@@ -1084,7 +1084,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
}
else if (hh->ParamList["xml"].empty())
{
- hh->SetHeader(HTTP_OK, "text/plain");
+ hh->SetHeader(HTTP_OK, "text/plain; charset=iso-8859-1");
if (hh->ParamList["1"] == "ext")
{
CZapitClient::BouquetChannelList *channellist = NeutrinoAPI->GetChannelList(CZapitClient::MODE_CURRENT);
@@ -1169,7 +1169,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
// stoptime : show only items until stoptime reached
else if (!(hh->ParamList["xml"].empty()))
{
- hh->SetHeader(HTTP_OK, "text/xml");
+ hh->SetHeader(HTTP_OK, "text/xml; charset=iso-8859-1");
t_channel_id channel_id = (t_channel_id)-1;
@@ -2273,7 +2273,7 @@ void CControlAPI::build_live_url(CyhookHandler *hh)
}
else
{
- hh->SetHeader(HTTP_OK, "text/html");
+ hh->SetHeader(HTTP_OK, "text/html; charset=iso-8859-1");
hh->Write(url);
}
}
commit 5f12efedb20aca25e63f3483faf97efecb137905
Author: Christian Schuett <Gau...@ho...>
Date: Wed Aug 7 17:41:34 2013 +0200
Neutrino: add PCR PID handling to direct recording and live streaming
based on patch by Jacek Jendrzej <cra...@go...> in Coolstream Git
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 3376076..d783e48 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -1631,7 +1631,8 @@ void CControlAPI::SendAllCurrentVAPid(CyhookHandler *hh)
hh->printf("%05u vtxt\n",pids.PIDs.vtxtpid);
if (pids.PIDs.pmtpid)
hh->printf("%05u pmt\n",pids.PIDs.pmtpid);
-
+ if (pids.PIDs.pcrpid)
+ hh->printf("%05u pcr\n",pids.PIDs.pcrpid);
}
//-----------------------------------------------------------------------------
@@ -1757,9 +1758,17 @@ void CControlAPI::YWeb_SendVideoStreamingPids(CyhookHandler *hh, int apid_no)
if(!pids.APIDs.empty())
apid = pids.APIDs[apid_idx].pid;
if(hh->ParamList["no_commas"] != "")
+ {
hh->printf("0x%04x 0x%04x 0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
+ if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ hh->printf(" 0x%04x", pids.PIDs.pcrpid);
+ }
else
+ {
hh->printf("0x%04x,0x%04x,0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
+ if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ hh->printf(",0x%04x", pids.PIDs.pcrpid);
+ }
}
//-----------------------------------------------------------------------------
@@ -2232,6 +2241,8 @@ void CControlAPI::build_live_url(CyhookHandler *hh)
if(!pids.APIDs.empty())
apid = pids.APIDs[apid_idx].pid;
xpids = string_printf("0x%04x,0x%04x,0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
+ if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ xpids += string_printf(",0x%04x", pids.PIDs.pcrpid);
}
else if ( mode == CZapitClient::MODE_RADIO)
{
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index c8147c3..6e39a20 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -478,6 +478,7 @@ std::string CNeutrinoYParser::func_get_mode(CyhookHandler */*hh*/, std::string
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_video_pids(CyhookHandler */*hh*/, std::string para)
{
+ std::string yresult;
CZapitClient::responseGetPIDs pids;
int apid=0,apid_no=0,apid_idx=0;
pids.PIDs.vpid=0;
@@ -490,7 +491,10 @@ std::string CNeutrinoYParser::func_get_video_pids(CyhookHandler */*hh*/, std::s
apid_idx=apid_no;
if(!pids.APIDs.empty())
apid = pids.APIDs[apid_idx].pid;
- return string_printf("0x%04x,0x%04x,0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
+ yresult = string_printf("0x%04x,0x%04x,0x%04x", pids.PIDs.pmtpid, pids.PIDs.vpid, apid);
+ if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ yresult += string_printf(",0x%04x", pids.PIDs.pcrpid);
+ return yresult;
}
//-------------------------------------------------------------------------
// y-func : get_radio_pids (returns: 0x0000)
@@ -671,6 +675,7 @@ std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, s
hh->ParamList["apid"] = itoh(serviceinfo.apid);
hh->ParamList["vtxtpid"] = (serviceinfo.vtxtpid != 0)?itoh(serviceinfo.vtxtpid):"nicht verfügbar";
hh->ParamList["pmtpid"] = (serviceinfo.pmtpid != 0)?itoh(serviceinfo.pmtpid):"nicht verfügbar";
+ hh->ParamList["pcrpid"] = (serviceinfo.pcrpid != 0)?itoh(serviceinfo.pcrpid):"nicht verfügbar";
if (serviceinfo.polarisation != 2) /* only satellite has polarisation */
{
hh->ParamList["tsfrequency"] = string_printf("%d.%03d MHz", serviceinfo.tsfrequency / 1000, serviceinfo.tsfrequency % 1000);
diff --git a/tuxbox/neutrino/src/driver/genpsi.c b/tuxbox/neutrino/src/driver/genpsi.c
index c0166b7..475eade 100644
--- a/tuxbox/neutrino/src/driver/genpsi.c
+++ b/tuxbox/neutrino/src/driver/genpsi.c
@@ -37,13 +37,10 @@ $Id: genpsi.c,v 1.2 2006/01/16 12:45:54 sat_man Exp $
#define ES_TYPE_MPA 0x03
#define ES_TYPE_AC3 0x81
-#define EN_TYPE_VIDEO 0x00
-#define EN_TYPE_AUDIO 0x01
-#define EN_TYPE_TELTEX 0x02
-#define EN_TYPE_PCR 0x03
typedef struct
{
short nba;
+ uint16_t pcrpid;
uint16_t vpid;
uint16_t apid[10];
short isAC3[10];
@@ -55,6 +52,7 @@ void transfer_pids(uint16_t pid,uint16_t pidart,short isAC3)
switch(pidart)
{
case EN_TYPE_VIDEO:
+ avPids.pcrpid=pid;
avPids.vpid=pid;
break;
case EN_TYPE_AUDIO:
@@ -64,7 +62,9 @@ void transfer_pids(uint16_t pid,uint16_t pidart,short isAC3)
break;
case EN_TYPE_TELTEX:
break;
-
+ case EN_TYPE_PCR:
+ avPids.pcrpid=pid;
+ break;
default:
break;
}
@@ -157,8 +157,8 @@ int genpsi(int fd2)
//-- write row with desc. for pcr stream (eq. video) --
pkt[ofs] = EN_TYPE_PCR;
pkt[ofs+1] = 0x02;
- pkt[ofs+2] = (avPids.vpid>>8);
- pkt[ofs+3] = (avPids.vpid & 0xFF);
+ pkt[ofs+2] = (avPids.pcrpid>>8);
+ pkt[ofs+3] = (avPids.pcrpid & 0xFF);
//-- calculate CRC --
calc_crc32psi(&pkt[data_len], &pkt[OFS_HDR_2], data_len-OFS_HDR_2 );
@@ -180,8 +180,8 @@ int genpsi(int fd2)
pkt[OFS_HDR_2+2] = (patch_len & 0xFF);
//-- patch pcr PID --
ofs = OFS_PMT_DATA;
- pkt[ofs] |= (avPids.vpid>>8);
- pkt[ofs+1] = (avPids.vpid & 0xFF);
+ pkt[ofs] |= (avPids.pcrpid>>8);
+ pkt[ofs+1] = (avPids.pcrpid & 0xFF);
//-- write row with desc. for ES video stream --
ofs = OFS_STREAM_TAB;
pkt[ofs] = ES_TYPE_MPEG12;
@@ -205,6 +205,7 @@ int genpsi(int fd2)
//-- write TS packet --
bytes += write(fd2, pkt, SIZE_TS_PKT);
//-- finish --
+ avPids.pcrpid=0;
avPids.vpid=0;
avPids.nba=0;
return 1;
diff --git a/tuxbox/neutrino/src/driver/genpsi.h b/tuxbox/neutrino/src/driver/genpsi.h
index 8085894..91bf58e 100644
--- a/tuxbox/neutrino/src/driver/genpsi.h
+++ b/tuxbox/neutrino/src/driver/genpsi.h
@@ -26,6 +26,11 @@ $Id: genpsi.h,v 1.1 2005/08/15 14:47:52 metallica Exp $
#define __genpsi_h__
#include <inttypes.h>
+#define EN_TYPE_VIDEO 0x00
+#define EN_TYPE_AUDIO 0x01
+#define EN_TYPE_TELTEX 0x02
+#define EN_TYPE_PCR 0x03
+
int genpsi(int fd2);
void transfer_pids(uint16_t pid,uint16_t pidart,short isAC3);
diff --git a/tuxbox/neutrino/src/driver/vcrcontrol.cpp b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
index 341d88c..0ef635e 100644
--- a/tuxbox/neutrino/src/driver/vcrcontrol.cpp
+++ b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
@@ -761,7 +761,15 @@ bool CVCRControl::CFileDevice::Record(const t_channel_id channel_id, int mode, c
pids[0] = si.vpid;
numpids = 1;
if(sptsmode)
- transfer_pids(si.vpid,0x00,0);
+ transfer_pids(si.vpid, EN_TYPE_VIDEO, 0);
+
+ if (si.pcrpid != si.vpid)
+ {
+ pids[1] = si.pcrpid;
+ numpids = 2;
+ if(sptsmode)
+ transfer_pids(si.pcrpid, EN_TYPE_PCR, 0);
+ }
}
else
{
@@ -774,7 +782,7 @@ bool CVCRControl::CFileDevice::Record(const t_channel_id channel_id, int mode, c
{
pids[numpids++] = it->apid;
if(sptsmode)
- transfer_pids(it->apid,0x01, it->ac3 ? 1 : 0);
+ transfer_pids(it->apid, EN_TYPE_AUDIO, it->ac3 ? 1 : 0);
}
if(!apid_list.empty())
g_Zapit->setAudioChannel(apid_list.begin()->index);
commit 3093a9f6daedc7cfc0eb2be27c1a02f8e0b27612
Author: Christian Schuett <Gau...@ho...>
Date: Tue Aug 6 17:40:54 2013 +0200
Neutrino: fix calculation of volume bar position
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index b46bc31..13321fa 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -3550,41 +3550,41 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint)
const int iw = 24; // icon width
const int dx = w + b*2 + iw + nw + r; // width + 2*border + icon + numbers + round
const int bwx = 20; // border width x from left and right
- const int bwtop = 47; // border width y from top
- const int bwbot = 47; // border width y from bottom
+ const int bwtop = 20; // border width y from top
+ const int bwbot = 20; // border width y from bottom
int x, y;
int a_step = atoi(g_settings.audio_step);
volumeBarIsVisible = ((g_settings.volumebar_disp_pos != VOLUMEBAR_DISP_POS_OFF) ? true : false);
if( g_settings.volumebar_disp_pos == VOLUMEBAR_DISP_POS_TOP_RIGHT )
{
- x = g_settings.screen_EndX - dx - bwx - 40;
- y = g_settings.screen_StartY + dy + bwtop;
+ x = g_settings.screen_EndX - dx - bwx;
+ y = g_settings.screen_StartY + bwtop;
}
else if( g_settings.volumebar_disp_pos == VOLUMEBAR_DISP_POS_TOP_LEFT )
{
x = g_settings.screen_StartX + bwx;
- y = g_settings.screen_StartY + dy + bwtop;
+ y = g_settings.screen_StartY + bwtop;
}
else if( g_settings.volumebar_disp_pos == VOLUMEBAR_DISP_POS_BOTTOM_LEFT )
{
x = g_settings.screen_StartX + bwx;
- y = g_settings.screen_EndY - bwbot;
+ y = g_settings.screen_EndY - dy - bwbot;
}
else if( g_settings.volumebar_disp_pos == VOLUMEBAR_DISP_POS_BOTTOM_RIGHT )
{
x = g_settings.screen_EndX - dx - bwx;
- y = g_settings.screen_EndY- bwbot;
+ y = g_settings.screen_EndY - dy - bwbot;
}
else if( g_settings.volumebar_disp_pos == VOLUMEBAR_DISP_POS_HIGHER_CENTER )
{
x = (((g_settings.screen_EndX- g_settings.screen_StartX)- dx) / 2) + g_settings.screen_StartX;
- y = g_settings.screen_EndY - bwbot-140;
+ y = g_settings.screen_EndY - dy - bwbot - 140;
}
else /* if (g_settings.volumebar_disp_pos == VOLUMEBAR_DISP_POS_DEFAULT_CENTER) */
{
x = (((g_settings.screen_EndX- g_settings.screen_StartX)- dx) / 2) + g_settings.screen_StartX;
- y = g_settings.screen_EndY - bwbot;
+ y = g_settings.screen_EndY - dy - bwbot;
}
fb_pixel_t * pixbuf = NULL;
commit 4f2bf6c6a65575ec429065f358fd5cf5bf6831b9
Author: Christian Schuett <Gau...@ho...>
Date: Sun Aug 4 22:06:12 2013 +0200
Neutrino streaminfo: show PCR PID
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/streaminfo2.cpp b/tuxbox/neutrino/src/gui/streaminfo2.cpp
index 395a8b2..8e4d619 100644
--- a/tuxbox/neutrino/src/gui/streaminfo2.cpp
+++ b/tuxbox/neutrino/src/gui/streaminfo2.cpp
@@ -64,8 +64,8 @@ CStreamInfo2::CStreamInfo2()
iheight = g_Font[font_info]->getHeight();
sheight = g_Font[font_small]->getHeight();
- width = w_max(SCREEN_X, 10);
- height = h_max(SCREEN_Y, 10);
+ width = w_max(SCREEN_X, 20);
+ height = h_max(SCREEN_Y, 20);
x = getScreenStartX(width); //mainwindow position
y = getScreenStartY(height);
@@ -475,9 +475,9 @@ void CStreamInfo2::paint(int/*mode*/)
}
// Info Output
- paint_techinfo ( xpos, ypos );
+ paint_techinfo(xpos, ypos);
- paint_signal_fe_box ( pigboxes_x,(ypos + 175), 240, 190);
+ paint_signal_fe_box(pigboxes_x, ypos + 185, 240, 190);
// buttons
int button_y = ypos+background_h-8;
@@ -496,7 +496,7 @@ void CStreamInfo2::paint(int/*mode*/)
frameBuffer->paintBoxRel(0, 0, max_width, max_height, COL_MENUCONTENT_PLUS_0);
// -- paint large signal graph
- paint_signal_fe_box ( x, y, width, height - 100);
+ paint_signal_fe_box(x, y, width, height - 100);
// -- buttons
int button_y = y + height;
@@ -669,6 +669,12 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
g_Font[font_small]->RenderString(xpos, ypos, width-10, "PMTpid:", COL_MENUCONTENT, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, width-10, buf, COL_MENUCONTENT, 0, true); // UTF-8
+ //pcrpid
+ ypos+= sheight;
+ sprintf((char*) buf, "0x%04x", si.pcrpid);
+ g_Font[font_small]->RenderString(xpos, ypos, width-10, "PCRpid:", COL_MENUCONTENT, 0, true); // UTF-8
+ g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, width-10, buf, COL_MENUCONTENT, 0, true); // UTF-8
+
//vpid
ypos+= sheight;
if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){
commit fecd6a6e72121df43a80b42b87edd2608fbe342d
Author: Christian Schuett <Gau...@ho...>
Date: Sun Aug 4 19:13:57 2013 +0200
Neutrino infoviewer: fix spelling of an enum
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index dfb356a..6db652d 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -537,7 +537,7 @@ void CInfoViewer::showTitle(const int ChanNum, const std::string & Channel, cons
int ChannelLogoMode = showChannelLogo(channel_id); // get logo mode, paint channel logo if adjusted
- if (ChannelLogoMode != LOGO_AS_CHANNELLUM) // no logo in numberbox
+ if (ChannelLogoMode != LOGO_AS_CHANNELNUM) // no logo in numberbox
{
// show channel number in numberbox
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->RenderString(BoxStartX + ((ChanWidth - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getRenderWidth(strChanNum))>>1), ChanNumYPos, ChanWidth, strChanNum, col_NumBoxText);
@@ -1908,7 +1908,6 @@ int CInfoViewer::showChannelLogo( const t_channel_id logo_channel_id )
if (g_settings.infobar_show_channellogo != NO_LOGO)
{
-
// check if logo is available
if (access(strAbsIconChIDPath.c_str(), 0) != -1)
{
@@ -1932,7 +1931,7 @@ int CInfoViewer::showChannelLogo( const t_channel_id logo_channel_id )
}
else
{
- if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELLUM)
+ if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELNUM)
{
// calculate mid of numberbox
int satNameHeight = 0; // no sat name display now, picon doesnt need to set an offset for y
@@ -1942,7 +1941,7 @@ int CInfoViewer::showChannelLogo( const t_channel_id logo_channel_id )
// check logo dimensions
if ((logo_w > ChanWidth) || (logo_h > ChanHeight))
{
- printf(strErrText.c_str(), ChanWidth, ChanHeight, logo_w, logo_h, LOGO_AS_CHANNELLUM);
+ printf(strErrText.c_str(), ChanWidth, ChanHeight, logo_w, logo_h, LOGO_AS_CHANNELNUM);
}
else
{
@@ -1951,7 +1950,7 @@ int CInfoViewer::showChannelLogo( const t_channel_id logo_channel_id )
// get position of channel logo, must be centered in number box
logo_x = x_mid - logo_w/2;
logo_y = y_mid - logo_h/2;
- res = LOGO_AS_CHANNELLUM;
+ res = LOGO_AS_CHANNELNUM;
}
}
else if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELNAME)
diff --git a/tuxbox/neutrino/src/gui/infoviewer.h b/tuxbox/neutrino/src/gui/infoviewer.h
index 00338a5..b959967 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.h
+++ b/tuxbox/neutrino/src/gui/infoviewer.h
@@ -166,7 +166,7 @@ class CInfoViewer
enum
{
NO_LOGO,
- LOGO_AS_CHANNELLUM,
+ LOGO_AS_CHANNELNUM,
LOGO_AS_CHANNELNAME,
LOGO_BESIDE_CHANNELNAME
};
diff --git a/tuxbox/neutrino/src/gui/osd_setup.cpp b/tuxbox/neutrino/src/gui/osd_setup.cpp
index dd88ed4..e8d6a6e 100644
--- a/tuxbox/neutrino/src/gui/osd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/osd_setup.cpp
@@ -467,7 +467,7 @@ const CMenuOptionChooser::keyval INFOBAR_EPG_SHOW_OPTIONS[INFOBAR_EPG_SHOW_OPTI
const CMenuOptionChooser::keyval INFOBAR_CHANNELLOGO_SHOW_OPTIONS[INFOBAR_CHANNELLOGO_SHOW_OPTIONS_COUNT]=
{
{ CInfoViewer::NO_LOGO , LOCALE_INFOVIEWER_CHANNELLOGO_OFF },
- { CInfoViewer::LOGO_AS_CHANNELLUM , LOCALE_INFOVIEWER_CHANNELLOGO_SHOW_IN_NUMBERBOX },
+ { CInfoViewer::LOGO_AS_CHANNELNUM , LOCALE_INFOVIEWER_CHANNELLOGO_SHOW_IN_NUMBERBOX },
{ CInfoViewer::LOGO_AS_CHANNELNAME , LOCALE_INFOVIEWER_CHANNELLOGO_SHOW_AS_CHANNELNAME },
{ CInfoViewer::LOGO_BESIDE_CHANNELNAME, LOCALE_INFOVIEWER_CHANNELLOGO_SHOW_BESIDE_CHANNELNAME }
};
commit 7b9fe4c296c9f56e84e78ce3ebd2d69427110169
Author: Christian Schuett <Gau...@ho...>
Date: Sat Aug 3 19:53:12 2013 +0200
Neutrino infoviewer: use enums instead of numbers
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 32381e7..dfb356a 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -537,9 +537,9 @@ void CInfoViewer::showTitle(const int ChanNum, const std::string & Channel, cons
int ChannelLogoMode = showChannelLogo(channel_id); // get logo mode, paint channel logo if adjusted
- if (ChannelLogoMode != 1) // no logo in numberbox
+ if (ChannelLogoMode != LOGO_AS_CHANNELLUM) // no logo in numberbox
{
- // show logo in numberbox
+ // show channel number in numberbox
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->RenderString(BoxStartX + ((ChanWidth - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getRenderWidth(strChanNum))>>1), ChanNumYPos, ChanWidth, strChanNum, col_NumBoxText);
}
@@ -1888,14 +1888,6 @@ void CInfoViewer::Set_CA_Status(int Status)
}
int CInfoViewer::showChannelLogo( const t_channel_id logo_channel_id )
-/* ****************************************************************************
-returns mode of painted channel logo,
-0 = no logo painted
-1 = in number box
-2 = in place of channel name
-3 = beside channel name
-*******************************************************************************
-*/
{
char strChanId[16];
sprintf((char*) strChanId, "%llx", logo_channel_id);
@@ -1909,10 +1901,10 @@ returns mode of painted channel logo,
int x_mid, y_mid, logo_w = 0, logo_h = 0;
int logo_x=0, logo_y=0;
- int res = 0;
+ int res = NO_LOGO;
int start_x = ChanNameX, chan_w = BoxEndX- (start_x+ 20)- time_width- 15;
- bool logo_available;
+ bool logo_available = false;
if (g_settings.infobar_show_channellogo != NO_LOGO)
{
@@ -1928,8 +1920,6 @@ returns mode of painted channel logo,
strAbsIconPath = strAbsIconChNamePath; // strLogoName;
logo_available = true;
}
- else
- logo_available = false;
if (logo_available)
{
@@ -1939,9 +1929,8 @@ returns mode of painted channel logo,
if ((logo_w == 0) || (logo_h == 0)) // corrupt logo size?
{
printf("[infoviewer] channel logo: \n -> %s (%s) has no size\n -> please check logo file!\n",strAbsIconPath.c_str(), ChannelName.c_str());
- return 0;
}
-
+ else
{
if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELLUM)
{
@@ -1953,8 +1942,7 @@ returns mode of painted channel logo,
// check logo dimensions
if ((logo_w > ChanWidth) || (logo_h > ChanHeight))
{
- printf(strErrText.c_str(),ChanWidth, ChanHeight, logo_w, logo_h, g_settings.infobar_show_channellogo);
- res = 0;
+ printf(strErrText.c_str(), ChanWidth, ChanHeight, logo_w, logo_h, LOGO_AS_CHANNELLUM);
}
else
{
@@ -1963,7 +1951,7 @@ returns mode of painted channel logo,
// get position of channel logo, must be centered in number box
logo_x = x_mid - logo_w/2;
logo_y = y_mid - logo_h/2;
- res = 1;
+ res = LOGO_AS_CHANNELLUM;
}
}
else if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELNAME)
@@ -1971,8 +1959,7 @@ returns mode of painted channel logo,
// check logo dimensions
if ((logo_w > chan_w) || (logo_h > ChanHeight))
{
- printf(strErrText.c_str(), chan_w, ChanHeight, logo_w, logo_h, g_settings.infobar_show_channellogo);
- res = 0;
+ printf(strErrText.c_str(), chan_w, ChanHeight, logo_w, logo_h, LOGO_AS_CHANNELNAME);
}
else
{
@@ -1982,7 +1969,7 @@ returns mode of painted channel logo,
y_mid = (ChanNameY+time_height) - time_height/2;
logo_x = start_x+10;
logo_y = y_mid - logo_h/2;
- res = 2;
+ res = LOGO_AS_CHANNELNAME;
}
}
else if (g_settings.infobar_show_channellogo == LOGO_BESIDE_CHANNELNAME)
@@ -1991,8 +1978,7 @@ returns mode of painted channel logo,
int Logo_max_width = chan_w - logo_w - 10;
if ((logo_w > Logo_max_width) || (logo_h > ChanHeight))
{
- printf(strErrText.c_str(), Logo_max_width, ChanHeight, logo_w, logo_h, g_settings.infobar_show_channellogo);
- res = 0;
+ printf(strErrText.c_str(), Logo_max_width, ChanHeight, logo_w, logo_h, LOGO_BESIDE_CHANNELNAME);
}
else
{
@@ -2003,16 +1989,12 @@ returns mode of painted channel logo,
// set channel name x pos
ChanNameX = start_x + logo_w + 10;
- res = 3;
+ res = LOGO_BESIDE_CHANNELNAME;
}
}
- else
- {
- res = 0;
- }
// paint logo background (shaded/framed)
- if ((g_settings.infobar_channellogo_background != NO_BACKGROUND) && (res != 0))
+ if ((g_settings.infobar_channellogo_background != NO_BACKGROUND) && (res != NO_LOGO))
{
int frame_w = 2, logo_bg_x=0, logo_bg_y=0, logo_bg_w=0, logo_bg_h=0;
@@ -2036,9 +2018,10 @@ returns mode of painted channel logo,
}
// paint the logo
- if (res !=0) {
+ if (res != NO_LOGO)
+ {
if (!frameBuffer->paintIcon(strAbsIconPath, logo_x, logo_y))
- return 0; // paint logo was failed
+ res = NO_LOGO; // paint logo was failed
}
}
}
commit 73590e667d2b2e7f196b497b9e2fee032f0d92d8
Author: Christian Schuett <Gau...@ho...>
Date: Sat Aug 3 18:13:52 2013 +0200
Neutrino: fix one more delete[] vs delete error
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index d5ef65a..b46bc31 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -2660,7 +2660,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t m, neutrino_msg_data_t data)
if (msg == CRCInput::RC_ignore)
{
- delete (unsigned char*) data;
+ delete [] (unsigned char*) data;
return messages_return::handled;
}
commit 1bafbcabc9d67c86acd4178187f8a4e1ad93af07
Author: [CST] Focus <foc...@gm...>
Date: Tue Jul 30 21:01:19 2013 +0200
Neutrino english.locale: little changes/corrections
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index e80f401..b849e12 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -1086,7 +1086,7 @@ osdsettings.show_mute_icon Mute-Icon on volume 0
osdsettings.themeselect Select Theme
osdsettings.volumebar_disp_pos Volumebar
parentallock.changepin change PIN code
-parentallock.changepin_hint1 Enter your new youth protection pin code here!
+parentallock.changepin_hint1 Enter your new parental lock pin code here!
parentallock.changetolocked on locked bouquets
parentallock.head Enter PIN code
parentallock.lockage lock program
@@ -1097,7 +1097,7 @@ parentallock.lockedchannel Locked sender...
parentallock.lockedprogram Locked program (from %d years up)
parentallock.never never
parentallock.onsignal on broadcasted lock
-parentallock.parentallock Youth protection
+parentallock.parentallock Parental lock
parentallock.prompt prompt for PIN
personalize.access Access options
personalize.apply_settings Apply changes?
@@ -1111,7 +1111,7 @@ personalize.help_line3 can be set to visible, not visible, activate, deactivate
personalize.help_line4 or PIN-protected.
personalize.help_line5 The access to personalization can be protected
personalize.help_line6 with PIN. The PIN is identical for all protected menus
-personalize.help_line7 (not for youth protection).
+personalize.help_line7 (not for parental lock).
personalize.help_line8 Default PIN is: 0000
personalize.menuconfiguration Menu Configuration
personalize.menudisabledhint The requested menu is currently disabled
@@ -1211,7 +1211,7 @@ recordingmenu.server_ip Recording Server IP
recordingmenu.server_mac MAC Address
recordingmenu.server_port Recording Server Port
recordingmenu.server_wakeup Recording Server WOL
-recordingmenu.setupnow activate changes
+recordingmenu.setupnow Activate changes
recordingmenu.splitsize Maximum File Size (MB)
recordingmenu.stopplayback Stop playback
recordingmenu.stream_subtitle_pid Record Subtitles
commit b834a5a65e6eb5a2752fa3e8954c9c04d6f3db6d
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jul 27 23:19:07 2013 +0200
Neutrino pluginlist: small optimization
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/pluginlist.cpp b/tuxbox/neutrino/src/gui/pluginlist.cpp
index 1cadfca..5b98811 100644
--- a/tuxbox/neutrino/src/gui/pluginlist.cpp
+++ b/tuxbox/neutrino/src/gui/pluginlist.cpp
@@ -130,7 +130,7 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
pluginlist.push_back(tmp);
}
}
- if (selected >= pluginlist.size() - 1)
+ if (selected >= pluginlist.size())
selected = pluginlist.size() - 1;
paint();
commit 3f8c798027c79fe2bbe191117faef78873377b37
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jul 27 20:02:32 2013 +0200
Neutrino timerlist: also adapt selection if list shrinks by more than one
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index b2e18bb..636d7ba 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -420,7 +420,7 @@ void CTimerList::updateEvents(void)
listmaxshow=timerlist.size();
height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
}
- if (!timerlist.empty() && selected==timerlist.size())
+ if (!timerlist.empty() && selected >= timerlist.size())
{
selected=timerlist.size()-1;
liststart = (selected/listmaxshow)*listmaxshow;
commit f0b7d2a1bacf38a978b175c6251eafe30c832eb6
Author: [CST] Focus <foc...@gm...>
Date: Sat Jul 20 19:41:44 2013 +0200
Neutrino filebrowser: restore selection, remove double paint on exec(),
remember selected to restore on dir enter with OK button
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index 2eb90ff..ae26658 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -842,9 +842,13 @@ bool CFileBrowser::exec(const char * const dirname)
name = dirname;
std::replace(name.begin(), name.end(), '\\', '/');
+ int selection = -1;
+ if (name == Path)
+ selection = selected;
+
paintHead();
- ChangeDir(name);
- paint();
+ ChangeDir(name, selection);
+ //paint();
paintFoot();
int oldselected = selected;
@@ -1038,7 +1042,10 @@ bool CFileBrowser::exec(const char * const dirname)
ChangeDir(filelist[selected].Url);
else
#endif
+ {
+ selections.push_back(selected);
ChangeDir(filelist[selected].Name);
+ }
}
else
{
commit 07d6b10a3f055ab2230628878beb61c799cd4ad1
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jul 13 15:13:47 2013 +0200
Neutrino menu separator: use enum instead of number in constructor
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/widget/menue.h b/tuxbox/neutrino/src/gui/widget/menue.h
index c1be247..08fae78 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.h
+++ b/tuxbox/neutrino/src/gui/widget/menue.h
@@ -152,7 +152,7 @@ class CMenuSeparator : public CMenuItem
};
- CMenuSeparator(const int Type = 0, const neutrino_locale_t Text = NONEXISTANT_LOCALE);
+ CMenuSeparator(const int Type = EMPTY, const neutrino_locale_t Text = NONEXISTANT_LOCALE);
virtual ~CMenuSeparator(){}
int paint(bool selected=false);
commit 8327a2a566daf66761b19cb7794e01a64678d005
Author: Christian Schuett <Gau...@ho...>
Date: Fri Jul 12 22:24:39 2013 +0200
Neutrino: add some more enums and use them instead of numbers
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/driver/lcdd.cpp b/tuxbox/neutrino/src/driver/lcdd.cpp
index 7dab7b9..697919b 100644
--- a/tuxbox/neutrino/src/driver/lcdd.cpp
+++ b/tuxbox/neutrino/src/driver/lcdd.cpp
@@ -439,10 +439,10 @@ static std::string splitString(const std::string & text, const int maxwidth, Lcd
void CLCD::showTextScreen(const std::string & big, const std::string & small, const int showmode, const bool perform_wakeup)
{
/* the "showmode" variable is a bit map:
- 0x01 show "big" string
- 0x02 show "small" string
- 0x04 show separator line if big and small are present / shown
- 0x08 show only one line of "big" string
+ EPG_NAME show "big" string
+ EPG_SHORT show only one line of "big" string
+ EPG_TITLE show "small" string
+ EPG_SEPLINE show separator line if big and small are present / shown
*/
/* draw_fill_rect is braindead: it actually fills _inside_ the described rectangle,
@@ -455,10 +455,10 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
std::string cname[2];
std::string event[4];
int namelines = 0, eventlines = 0, maxnamelines = 2;
- if (showmode & 8)
+ if (showmode & EPG_SHORT)
maxnamelines = 1;
- if ((showmode & 1) && !big.empty())
+ if ((showmode & EPG_NAME) && !big.empty())
{
bool dumb = false;
big_utf8 = isUTF8(big);
@@ -482,7 +482,7 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
// one nameline => 2 eventlines, 2 namelines => 1 eventline
int maxeventlines = 4 - (namelines * 3 + 1) / 2;
- if ((showmode & 2) && !small.empty())
+ if ((showmode & EPG_TITLE) && !small.empty())
{
bool dumb = false;
small_utf8 = isUTF8(small);
@@ -520,7 +520,7 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
fonts.channelname->RenderString(x, y, LCD_COLS + 10, cname[i].c_str(), CLCDDisplay::PIXEL_ON, 0, big_utf8);
}
y++;
- if (eventlines > 0 && namelines > 0 && showmode & 4)
+ if (eventlines > 0 && namelines > 0 && (showmode & EPG_SEPLINE))
{
y++;
display.draw_line(0, y, LCD_COLS - 1, y, CLCDDisplay::PIXEL_ON);
@@ -546,11 +546,6 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
void CLCD::showServicename(const std::string name, const bool perform_wakeup)
{
- /*
- 1 = show servicename
- 2 = show epg title
- 4 = draw separator line between name and EPG
- */
int showmode = g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGMODE];
//printf("CLCD::showServicename '%s' epg: '%s'\n", name.c_str(), epg_title.c_str());
@@ -589,7 +584,7 @@ void CLCD::setMoviePlaymode(const AUDIOMODES playmode)
void CLCD::setMovieInfo(const std::string big, const std::string small)
{
int showmode = g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGMODE];
- showmode |= 3; // take only the separator line from the config
+ showmode |= EPG_NAME | EPG_TITLE; // take only the separator line from the config
movie_big = big;
movie_small = small;
@@ -670,11 +665,11 @@ void CLCD::showVolume(const char vol, const bool perform_update)
{
volume = vol;
if (
- ((mode == MODE_TVRADIO) && (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME])) ||
- ((mode == MODE_MOVIE) && (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME])) ||
+ ((mode == MODE_TVRADIO || mode == MODE_MOVIE) &&
+ g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != STATUSLINE_PLAYTIME) ||
(mode == MODE_SCART) ||
(mode == MODE_AUDIO)
- )
+ )
{
display.draw_fill_rect (11,53,73,61, CLCDDisplay::PIXEL_OFF);
//strichlin
diff --git a/tuxbox/neutrino/src/driver/lcdd.h b/tuxbox/neutrino/src/driver/lcdd.h
index 815bf00..6e32fc2 100644
--- a/tuxbox/neutrino/src/driver/lcdd.h
+++ b/tuxbox/neutrino/src/driver/lcdd.h
@@ -91,6 +91,13 @@ class CLCD
EPGALIGN_LEFT,
EPGALIGN_CENTER
};
+ enum EPGMODE
+ {
+ EPG_NAME = 1, // show service name
+ EPG_TITLE = 2, // show EPG title
+ EPG_SEPLINE = 4, // draw separator line between name and title
+ EPG_SHORT = 8 // show only one line of service name
+ };
private:
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index e8d146f..ec411ba 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -686,7 +686,7 @@ void CChannelList::zapTo(int pos, bool forceStoreToLastChannels)
#endif
tuned = pos;
- if (g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGMODE] & 0x02)
+ if (g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGMODE] & CLCD::EPG_TITLE)
{ /* microoptimization: only poll sectionsd if epg title display is configured
not sure if this is necessary, but the extra check won't hurt... */
CSectionsdClient::CurrentNextInfo info;
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 32aedd6..32381e7 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -2049,7 +2049,7 @@ returns mode of painted channel logo,
void CInfoViewer::showLcdPercentOver()
{
- if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != 1)
+ if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != CLCD::STATUSLINE_VOLUME)
{
static long long old_interval = 0;
int runningPercent=-1;
diff --git a/tuxbox/neutrino/src/gui/lcd_setup.cpp b/tuxbox/neutrino/src/gui/lcd_setup.cpp
index 16e6ce3..d0384f1 100644
--- a/tuxbox/neutrino/src/gui/lcd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/lcd_setup.cpp
@@ -86,12 +86,12 @@ const CMenuOptionChooser::keyval LCDMENU_STATUSLINE_OPTIONS[LCDMENU_STATUSLINE_O
#define LCDMENU_EPG_OPTION_COUNT 6
const CMenuOptionChooser::keyval LCDMENU_EPG_OPTIONS[LCDMENU_EPG_OPTION_COUNT] =
{
- { 1, LOCALE_LCDMENU_EPG_NAME },
- { 2, LOCALE_LCDMENU_EPG_TITLE },
- { 3, LOCALE_LCDMENU_EPG_NAME_TITLE },
- { 7, LOCALE_LCDMENU_EPG_NAME_SEPLINE_TITLE },
- { 11, LOCALE_LCDMENU_EPG_NAMESHORT_TITLE },
- { 15, LOCALE_LCDMENU_EPG_NAMESHORT_SEPLINE_TITLE }
+ { CLCD::EPG_NAME , LOCALE_LCDMENU_EPG_NAME },
+ { CLCD::EPG_TITLE , LOCALE_LCDMENU_EPG_TITLE },
+ { CLCD::EPG_NAME | CLCD::EPG_TITLE , LOCALE_LCDMENU_EPG_NAME_TITLE },
+ { CLCD::EPG_NAME | CLCD::EPG_TITLE | CLCD::EPG_SEPLINE , LOCALE_LCDMENU_EPG_NAME_SEPLINE_TITLE },
+ { CLCD::EPG_NAME | CLCD::EPG_SHORT | CLCD::EPG_TITLE , LOCALE_LCDMENU_EPG_NAMESHORT_TITLE },
+ { CLCD::EPG_NAME | CLCD::EPG_SHORT | CLCD::EPG_TITLE | CLCD::EPG_SEPLINE, LOCALE_LCDMENU_EPG_NAMESHORT_SEPLINE_TITLE }
};
#define LCDMENU_EPGALIGN_OPTION_COUNT 2
diff --git a/tuxbox/neutrino/src/gui/scan_setup.cpp b/tuxbox/neutrino/src/gui/scan_setup.cpp
index 8f47229..a6b5872 100644
--- a/tuxbox/neutrino/src/gui/scan_setup.cpp
+++ b/tuxbox/neutrino/src/gui/scan_setup.cpp
@@ -126,14 +126,13 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT]
#define CABLESETUP_SCANTP_MOD_COUNT 7
const CMenuOptionChooser::keyval CABLESETUP_SCANTP_MOD[CABLESETUP_SCANTP_MOD_COUNT] =
{
- {0, LOCALE_SCANTP_MOD_QPSK } ,
- {1, LOCALE_SCANTP_MOD_QAM_16 } ,
- {2, LOCALE_SCANTP_MOD_QAM_32 } ,
- {3, LOCALE_SCANTP_MOD_QAM_64 } ,
- {4, LOCALE_SCANTP_MOD_QAM_128 } ,
- {5, LOCALE_SCANTP_MOD_QAM_256 } ,
- {6, LOCALE_SCANTP_MOD_QAM_AUTO }
-
+ { QPSK , LOCALE_SCANTP_MOD_QPSK },
+ { QAM_16 , LOCALE_SCANTP_MOD_QAM_16 },
+ { QAM_32 , LOCALE_SCANTP_MOD_QAM_32 },
+ { QAM_64 , LOCALE_SCANTP_MOD_QAM_64 },
+ { QAM_128 , LOCALE_SCANTP_MOD_QAM_128 },
+ { QAM_256 , LOCALE_SCANTP_MOD_QAM_256 },
+ { QAM_AUTO, LOCALE_SCANTP_MOD_QAM_AUTO }
};
#define SATSETUP_SCANTP_POL_COUNT 2
diff --git a/tuxbox/neutrino/src/system/settings.h b/tuxbox/neutrino/src/system/settings.h
index b4b45b8..ef91bda 100644
--- a/tuxbox/neutrino/src/system/settings.h
+++ b/tuxbox/neutrino/src/system/settings.h
@@ -561,7 +561,7 @@ const time_settings_struct_t timing_setting[TIMING_SETTING_COUNT] =
#define DEFAULT_LCD_INVERSE 0x00
#define DEFAULT_LCD_AUTODIMM 0x00
#define DEFAULT_LCD_SHOW_VOLUME CLCD::STATUSLINE_VOLUME
-#define DEFAULT_LCD_EPGMODE 0x01 /* 0x1 = name 0x2 = epgtitle 0x4 = separator */
+#define DEFAULT_LCD_EPGMODE CLCD::EPG_NAME
#define DEFAULT_LCD_BIAS 0x00 /* 0x0 = default for philips rev 2, 0x1 = default for all others */
#define DEFAULT_LCD_EPGALIGN CLCD::EPGALIGN_LEFT
commit 694e186ffdb5aa62fbef44d5a7e62702edf5e43d
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jul 6 21:53:27 2013 +0200
Neutrino: remove unnecessary SendSectionsdConfig() calls
sectionsd saves and rereads its config when restarted
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/driver/vcrcontrol.cpp b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
index 42636cb..341d88c 100644
--- a/tuxbox/neutrino/src/driver/vcrcontrol.cpp
+++ b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
@@ -358,7 +358,6 @@ void CVCRControl::CFileAndServerDevice::RestoreNeutrino(void)
{
g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(g_RemoteControl->current_channel_id, false);
- CNeutrinoApp::getInstance()->SendSectionsdConfig();
}
// alten mode wieder herstellen (ausser wen zwischenzeitlich auf oder aus sb geschalten wurde)
diff --git a/tuxbox/neutrino/src/gui/movieplayer.cpp b/tuxbox/neutrino/src/gui/movieplayer.cpp
index 303fd90..c9cd0b2 100644
--- a/tuxbox/neutrino/src/gui/movieplayer.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer.cpp
@@ -567,7 +567,6 @@ CMoviePlayerGui::exec (CMenuTarget * parent, const std::string & actionKey)
{
g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(g_RemoteControl->current_channel_id, false);
- CNeutrinoApp::getInstance()->SendSectionsdConfig();
}
// Restore last mode
diff --git a/tuxbox/neutrino/src/gui/movieplayer2.cpp b/tuxbox/neutrino/src/gui/movieplayer2.cpp
index b533345..a6ab3c0 100644
--- a/tuxbox/neutrino/src/gui/movieplayer2.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer2.cpp
@@ -542,7 +542,6 @@ CMoviePlayerGui::exec(CMenuTarget *parent, const std::string &actionKey)
{
g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(g_RemoteControl->current_channel_id, false);
- CNeutrinoApp::getInstance()->SendSectionsdConfig();
}
// Restore last mode
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 0adc64c..d5ef65a 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -4193,7 +4193,6 @@ int CNeutrinoApp::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
g_Sectionsd->RegisterNeutrino();
g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(g_RemoteControl->current_channel_id, false);
- SendSectionsdConfig();
returnval = menu_return::RETURN_REPAINT; // just to show that something was done
}
#ifdef ENABLE_MOVIEPLAYER2
commit f5e16560ba1d4cea50794e3b3da17ceacf637db3
Author: Christian Schuett <Gau...@ho...>
Date: Sat Jul 6 21:10:54 2013 +0200
Neutrino: add some enums and use them instead of numbers
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/driver/lcdd.cpp b/tuxbox/neutrino/src/driver/lcdd.cpp
index 3ecd059..7dab7b9 100644
--- a/tuxbox/neutrino/src/driver/lcdd.cpp
+++ b/tuxbox/neutrino/src/driver/lcdd.cpp
@@ -512,7 +512,7 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
int x = 1;
for (int i = 0; i < namelines; i++) {
y += 14;
- if (g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGALIGN] == 1) // centered
+ if (g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGALIGN] == EPGALIGN_CENTER)
{
int w = fonts.channelname->getRenderWidth(cname[i].c_str(), big_utf8);
x = (LCD_COLS - w) / 2;
@@ -529,7 +529,7 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
{
for (int i = 0; i < eventlines; i++) {
y += 10;
- if (g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGALIGN] == 1) // centered
+ if (g_settings.lcd_setting[SNeutrinoSettings::LCD_EPGALIGN] == EPGALIGN_CENTER)
{
int w = fonts.menu->getRenderWidth(event[i].c_str(), small_utf8);
x = (LCD_COLS - w) / 2;
@@ -712,15 +712,15 @@ void CLCD::showPercentOver(const unsigned char perc, const bool perform_update,
percentOver = perc;
if (mode == MODE_TVRADIO || mode == MODE_MOVIE)
{
- if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] == 0)
+ if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] == STATUSLINE_PLAYTIME)
{
left = 12; top = 55; width = 60;
}
- else if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] == 2)
+ else if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] == STATUSLINE_BOTH)
{
left = 12; top = 3; width = 104;
}
- else if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] == 3)
+ else if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] == STATUSLINE_BOTH_AUDIO)
{
left = 12; top = 3; width = 84;
@@ -897,20 +897,20 @@ void CLCD::setMode(const MODES m, const char * const title)
case MODE_MOVIE:
switch (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME])
{
- case 0:
+ case STATUSLINE_PLAYTIME:
display.load_screen(&(background[BACKGROUND_LCD2]));
showPercentOver(percentOver, false, mode);
break;
- case 1:
+ case STATUSLINE_VOLUME:
display.load_screen(&(background[BACKGROUND_LCD]));
showVolume(volume, false);
break;
- case 2:
+ case STATUSLINE_BOTH:
display.load_screen(&(background[BACKGROUND_LCD3]));
showVolume(volume, false);
showPercentOver(percentOver, false, mode);
break;
- case 3:
+ case STATUSLINE_BOTH_AUDIO:
display.load_screen(&(background[BACKGROUND_LCD4]));
showVolume(volume, false);
showPercentOver(percentOver, false, mode);
diff --git a/tuxbox/neutrino/src/driver/lcdd.h b/tuxbox/neutrino/src/driver/lcdd.h
index ca5aff2..815bf00 100644
--- a/tuxbox/neutrino/src/driver/lcdd.h
+++ b/tuxbox/neutrino/src/driver/lcdd.h
@@ -79,6 +79,18 @@ class CLCD
AUDIO_MODE_PAUSE,
AUDIO_MODE_REV
};
+ enum STATUSLINE
+ {
+ STATUSLINE_PLAYTIME,
+ STATUSLINE_VOLUME,
+ STATUSLINE_BOTH,
+ STATUSLINE_BOTH_AUDIO
+ };
+ enum EPGALIGN
+ {
+ EPGALIGN_LEFT,
+ EPGALIGN_CENTER
+ };
private:
diff --git a/tuxbox/neutrino/src/driver/vcrcontrol.cpp b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
index 8126ef8..42636cb 100644
--- a/tuxbox/neutrino/src/driver/vcrcontrol.cpp
+++ b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
@@ -350,11 +350,11 @@ void CVCRControl::CFileAndServerDevice::RestoreNeutrino(void)
g_Zapit->setRecordMode( false );
// sectionsd starten, wenn er gestoppt oder neu gestartet wurde
- if (StopSectionsd == 1)
+ if (StopSectionsd == CNeutrinoApp::SECTIONSD_STOP)
{
g_Sectionsd->setPauseScanning(false);
}
- else if (StopSectionsd == 2)
+ else if (StopSectionsd == CNeutrinoApp::SECTIONSD_RESTART)
{
g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(g_RemoteControl->current_channel_id, false);
@@ -420,11 +420,11 @@ void CVCRControl::CFileAndServerDevice::CutBackNeutrino(const t_channel_id chann
if(StopPlayBack && g_Zapit->isPlayBackActive()) // wenn playback gestoppt werden soll und noch l�uft
g_Zapit->stopPlayBack(); // dann playback stoppen
- if (StopSectionsd == 1) // wenn sectionsd gestoppt werden soll
+ if (StopSectionsd == CNeutrinoApp::SECTIONSD_STOP)
{
g_Sectionsd->setPauseScanning(true); // sectionsd stoppen
}
- else if (StopSectionsd == 2) // wenn sectionsd neu gestartet werden soll
+ else if (StopSectionsd == CNeutrinoApp::SECTIONSD_RESTART)
{
g_Sectionsd->Restart(); // sectionsd neu starten (pausiert automatisch)
g_Sectionsd->RegisterNeutrino();
diff --git a/tuxbox/neutrino/src/gui/audio_setup.cpp b/tuxbox/neutrino/src/gui/audio_setup.cpp
index c58b978..2dd8cea 100644
--- a/tuxbox/neutrino/src/gui/audio_setup.cpp
+++ b/tuxbox/neutrino/src/gui/audio_setup.cpp
@@ -109,15 +109,15 @@ const CMenuOptionChooser::keyval AUDIOMENU_AVS_CONTROL_OPTIONS[AUDIOMENU_AVS_CON
#define AUDIOMENU_LEFT_RIGHT_SELECTABLE_OPTION_COUNT 2
const CMenuOptionChooser::keyval AUDIOMENU_LEFT_RIGHT_SELECTABEL_OPTIONS[AUDIOMENU_LEFT_RIGHT_SELECTABLE_OPTION_COUNT] =
{
- { true, LOCALE_OPTIONS_ON },
- { false, LOCALE_OPTIONS_OFF }
+ { 1, LOCALE_OPTIONS_ON },
+ { 0, LOCALE_OPTIONS_OFF }
};
#define AUDIOMENU_AUDIOCHANNEL_UP_DOWN_ENABLE_COUNT 2
const CMenuOptionChooser::keyval AUDIOMENU_AUDIOCHANNEL_UP_DOWN_ENABLE_OPTIONS[AUDIOMENU_AUDIOCHANNEL_UP_DOWN_ENABLE_COUNT] =
{
- { true, LOCALE_OPTIONS_ON },
- { false, LOCALE_OPTIONS_OFF }
+ { 1, LOCALE_OPTIONS_ON },
+ { 0, LOCALE_OPTIONS_OFF }
};
/* audio settings menu */
diff --git a/tuxbox/neutrino/src/gui/bouquetlist.h b/tuxbox/neutrino/src/gui/bouquetlist.h
index c5a2d10..a5a9c04 100644
--- a/tuxbox/neutrino/src/gui/bouquetlist.h
+++ b/tuxbox/neutrino/src/gui/bouquetlist.h
@@ -44,9 +44,9 @@
typedef enum bouquetSwitchMode
{
- bsmBouquets, // pressing OK shows list of all Bouquets
- bsmChannels, // pressing OK shows list of all channels of active bouquets
- bsmAllChannels // OK shows lsit of all channels
+ bsmChannels, // pressing OK shows list of all channels of active bouquet
+ bsmBouquets, // pressing OK shows list of all bouquets
+ bsmAllChannels // pressing OK shows list of all channels
} BouquetSwitchMode;
class CBouquet
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 7b64849..e8d146f 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -139,7 +139,7 @@ int CChannelList::exec()
void CChannelList::calcSize()
{
full_width = w_max(720, 2 * ConnectLineBox_Width);
- if (g_settings.channellist_additional)
+ if (g_settings.channellist_additional != ADDITIONAL_OFF)
#if defined BOXMODEL_DM500 || defined HAVE_IPBOX_HARDWARE
// the dm500 seems to like only half / quarter resolution...
width = full_width - 180 -10;
@@ -448,7 +448,7 @@ int CChannelList::show()
}
else if ( msg == CRCInput::RC_blue )
{
- if (g_settings.channellist_additional) {
+ if (g_settings.channellist_additional != ADDITIONAL_OFF) {
displayList = !displayList;
if (displayList)
paint_events(selected);
@@ -1135,7 +1135,7 @@ void CChannelList::paintDetails(unsigned int index)
else {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight, full_width - 20, g_Locale->getText(LOCALE_EPGLIST_NOEVENTS), COL_MENUCONTENTDARK, 0, true); // UTF-8
}
- if(g_settings.channellist_foot == 0) {
+ if(g_settings.channellist_foot == FOOT_FREQ) {
TP_params TP;
g_Zapit->get_current_TP(&TP);
std::string desc = "";
@@ -1198,7 +1198,7 @@ void CChannelList::paintDetails(unsigned int index)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, full_width - 30, desc.c_str(), COL_MENUCONTENTDARK, 0, true);
}
- else if( !displayNext && g_settings.channellist_foot == 1) { // next Event 1
+ else if( !displayNext && g_settings.channellist_foot == FOOT_NEXT) {
char buf[128] = {0};
char cFrom[50] = {0}; // UTF-8
CSectionsdClient::CurrentNextInfo CurrentNext;
@@ -1213,7 +1213,7 @@ void CChannelList::paintDetails(unsigned int index)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- from_len, y+ height+ 5+ 3*fheight, from_len, cFrom, COL_MENUCONTENTDARK, 0, true); // UTF-8
}
}
- if (g_settings.channellist_additional) {
+ if (g_settings.channellist_additional != ADDITIONAL_OFF) {
if (displayList)
paint_events(selected);
else
@@ -1494,7 +1494,7 @@ void CChannelList::paintButtonBar()
int ButtonWidth = (full_width - 20) / 4;
//manage now/next button
- if (g_settings.channellist_additional)
+ if (g_settings.channellist_additional != ADDITIONAL_OFF)
{
if (displayList)
CChannelListButtons[2].locale = LOCALE_FONTSIZE_CHANNELLIST_DESCR;
@@ -1534,7 +1534,7 @@ void CChannelList::paint()
// paint background for main box
frameBuffer->paintBoxRel(x, y+theight, width, height-footerHeight-theight, COL_MENUCONTENT_PLUS_0);
- if (g_settings.channellist_additional)
+ if (g_settings.channellist_additional != ADDITIONAL_OFF)
// paint background for right box
frameBuffer->paintBoxRel(x+width,y+theight,infozone_width,pig_height+infozone_height,COL_MENUCONTENT_PLUS_0);
diff --git a/tuxbox/neutrino/src/gui/channellist.h b/tuxbox/neutrino/src/gui/channellist.h
index 510d9c3..c94b252 100644
--- a/tuxbox/neutrino/src/gui/channellist.h
+++ b/tuxbox/neutrino/src/gui/channellist.h
@@ -45,12 +45,6 @@
#include <string>
#include <vector>
- enum {
- ADDITIONAL_OFF,
- ADDITIONAL_ON,
- ADDITIONAL_MTV
- };
-
class CChannelList
{
public:
@@ -137,6 +131,20 @@ class CChannelList
void processTextToArray(std::string text);
public:
+ enum
+ {
+ ADDITIONAL_OFF,
+ ADDITIONAL_ON,
+ ADDITIONAL_MTV
+ };
+
+ enum
+ {
+ FOOT_FREQ,
+ FOOT_NEXT,
+ FOOT_OFF
+ };
+
CChannelList(const char * const Name, bool historyMode = false, bool UsedInBouquet = false);
~CChannelList();
void addChannel(int key, int number, const std::string& name, const t_satellite_position satellitePosition, t_channel_id ids = 0); // UTF-8
diff --git a/tuxbox/neutrino/src/gui/driver_boot_setup.cpp b/tuxbox/neutrino/src/gui/driver_boot_setup.cpp
index ab37921..45e7b6c 100644
--- a/tuxbox/neutrino/src/gui/driver_boot_setup.cpp
+++ b/tuxbox/neutrino/src/gui/driver_boot_setup.cpp
@@ -80,9 +80,9 @@ const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTIO
#define DRIVERSETTINGS_FB_DESTINATION_OPTION_COUNT 3
const CMenuOptionChooser::keyval DRIVERSETTINGS_FB_DESTINATION_OPTIONS[DRIVERSETTINGS_FB_DESTINATION_OPTION_COUNT] =
{
- { 0, LOCALE_OPTIONS_NULL },
- { 1, LOCALE_OPTIONS_SERIAL },
- { 2, LOCALE_OPTIONS_FB }
+ { CNeutrinoApp::UBOOT_CONSOLE_NULL , LOCALE_OPTIONS_NULL },
+ { CNeutrinoApp::UBOOT_CONSOLE_SERIAL, LOCALE_OPTIONS_SERIAL },
+ { CNeutrinoApp::UBOOT_CONSOLE_FB , LOCALE_OPTIONS_FB }
};
#define DRIVERSETTINGS_FDX_OPTION_COUNT 3
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 3af00be..32aedd6 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -895,7 +895,7 @@ void CInfoViewer::showSubchan()
int dx = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth(text, subChannelNameIsUTF) + 20;
int dy = 25;
- if( g_settings.infobar_subchan_disp_pos == 4 )
+ if( g_settings.infobar_subchan_disp_pos == SUBCHAN_DISP_POS_INFOBAR )
{
// show full infobar for subschannel
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR , 0 );
@@ -913,27 +913,23 @@ void CInfoViewer::showSubchan()
dy= dy +5;
int x=0,y=0;
- if( g_settings.infobar_subchan_disp_pos == 0 )
+ if( g_settings.infobar_subchan_disp_pos == SUBCHAN_DISP_POS_TOP_RIGHT )
{
- // Rechts-Oben
x = g_settings.screen_EndX - dx - 10;
y = g_settings.screen_StartY + 10;
}
- else if( g_settings.infobar_subchan_disp_pos == 1 )
+ else if( g_settings.infobar_subchan_disp_pos == SUBCHAN_DISP_POS_TOP_LEFT )
{
- // Links-Oben
x = g_settings.screen_StartX + 10;
y = g_settings.screen_StartY + 10;
}
- else if( g_settings.infobar_subchan_disp_pos == 2 )
+ else if( g_settings.infobar_subchan_disp_pos == SUBCHAN_DISP_POS_BOTTOM_LEFT )
{
- // Links-Unten
x = g_settings.screen_StartX + 10;
y = g_settings.screen_EndY - dy - 10;
}
- else if( g_settings.infobar_subchan_disp_pos == 3 )
+ else if( g_settings.infobar_subchan_disp_pos == SUBCHAN_DISP_POS_BOTTOM_RIGHT )
{
- // Rechts-Unten
x = g_settings.screen_EndX - dx - 10;
y = g_settings.screen_EndY - dy - 10;
}
@@ -1918,7 +1914,7 @@ returns mode of painted channel logo,
bool logo_available;
- if (g_settings.infobar_show_channellogo) // show logo only if "infobar_show_channellogo" adjusted to true, else use defaults
+ if (g_settings.infobar_show_channellogo != NO_LOGO)
{
// check if logo is available
@@ -1947,7 +1943,7 @@ returns mode of painted channel logo,
}
{
- if (g_settings.infobar_show_channellogo == 1) // paint logo in numberbox
+ if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELLUM)
{
// calculate mid of numberbox
int satNameHeight = 0; // no sat name display now, picon doesnt need to set an offset for y
@@ -1970,7 +1966,7 @@ returns mode of painted channel logo,
res = 1;
}
}
- else if (g_settings.infobar_show_channellogo == 2) // paint logo in place of channel name
+ else if (g_settings.infobar_show_channellogo == LOGO_AS_CHANNELNAME)
{
// check logo dimensions
if ((logo_w > chan_w) || (logo_h > ChanHeight))
@@ -1989,7 +1985,7 @@ returns mode of painted channel logo,
res = 2;
}
}
- else if (g_settings.infobar_show_channellogo == 3) // paint logo beside channel name
+ else if (g_settings.infobar_show_channellogo == LOGO_BESIDE_CHANNELNAME)
{
// check logo dimensions
int Logo_max_width = chan_w - logo_w - 10;
@@ -2016,11 +2012,11 @@ returns mode of painted channel logo,
}
// paint logo background (shaded/framed)
- if ((g_settings.infobar_channellogo_background !=0) && (res !=0)) // with background
+ if ((g_settings.infobar_channellogo_background != NO_BACKGROUND) && (res != 0))
{
int frame_w = 2, logo_bg_x=0, logo_bg_y=0, logo_bg_w=0, logo_bg_h=0;
- if (g_settings.infobar_channellogo_background == 1) // framed
+ if (g_settings.infobar_channellogo_background == LOGO_FRAMED)
{
//sh_offset = 2;
logo_bg_x = logo_x-frame_w;
@@ -2028,7 +2024,7 @@ returns mode of painted channel logo,
logo_bg_w = logo_w+frame_w*2;
logo_bg_h = logo_h+frame_w*2;
}
- else if (g_settings.infobar_channellog...
[truncated message content] |
