aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2008-11-24 09:58:05 +0100
committerFraxinas <andreas.frisch@multimedia-labs.de>2008-11-24 09:58:05 +0100
commit14cf6c3b6887b94bcdd65ee251207d9309e2ae24 (patch)
tree06b2c77ab533e20eff9ce8a06fb0dbb53acb24f7 /lib
parent74837aa1b9a2d0ee3cd630b74abcb224272290ab (diff)
parent7049be52bf2235dfb848b28dcd9aa44eb204771c (diff)
downloadenigma2-14cf6c3b6887b94bcdd65ee251207d9309e2ae24.tar.gz
enigma2-14cf6c3b6887b94bcdd65ee251207d9309e2ae24.zip
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib')
-rw-r--r--lib/dvb/frontend.cpp4
-rw-r--r--lib/python/Components/AVSwitch.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index b0e92d39..a74e65ca 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -728,7 +728,7 @@ int eDVBFrontend::readFrontendData(int type)
eDebug("FE_READ_SNR failed (%m)");
if (!strcmp(m_description, "BCM4501 (internal)"))
{
- unsigned int SDS_SNRE = snr << 16;
+ float SDS_SNRE = snr << 16;
float snr_in_db;
if (parm_u_qpsk_fec_inner <= FEC_AUTO) // DVB-S1 / QPSK
@@ -748,7 +748,7 @@ int eDVBFrontend::readFrontendData(int type)
if (fval1 < 10.0)
{
fval2 = SNR_COEFF[0];
- for (int i=0; i<6; ++i)
+ for (int i=1; i<6; ++i)
{
fval2 *= fval1;
fval2 += SNR_COEFF[i];
diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 00350cbb..1f529cfd 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -29,6 +29,7 @@ class AVSwitch:
eAVSwitch.getInstance().setVideomode(value)
def getOutputAspect(self):
+ valstr = config.av.aspectratio.value
if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
return (4,3)
elif valstr == "16_9": # auto ... 4:3 or 16:9