From f50ea7e42b05996b75eba9ed4376c539c5fc00ae Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 8 Feb 2006 21:24:22 +0000 Subject: [PATCH] dont set /proc/stb values directly from python.. use eavswitch as api abstraction layer enable pal/ntsc switching --- lib/driver/avswitch.cpp | 31 +++++++++++---- lib/driver/avswitch.h | 3 +- lib/python/Components/AVSwitch.py | 84 +++++++++++++++++++++++++-------------- 3 files changed, 80 insertions(+), 38 deletions(-) diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp index 12a8f7d..35df938 100644 --- a/lib/driver/avswitch.cpp +++ b/lib/driver/avswitch.cpp @@ -54,7 +54,6 @@ void eAVSwitch::setFastBlank(int val) int fd; char *fb[] = {"low", "high", "vcr"}; - if((fd = open("/proc/stb/avs/0/fb", O_WRONLY)) < 0) { printf("cannot open /proc/stb/avs/0/fb\n"); return; @@ -115,6 +114,7 @@ void eAVSwitch::setAspectRatio(int ratio) printf("cannot open /proc/stb/video/aspect\n"); return; } +// eDebug("set aspect to %s", aspect[ratio]); write(fd, aspect[ratio], strlen(aspect[ratio])); close(fd); @@ -122,6 +122,7 @@ void eAVSwitch::setAspectRatio(int ratio) printf("cannot open /proc/stb/video/policy\n"); return; } +// eDebug("set ratio to %s", policy[ratio]); write(fd, policy[ratio], strlen(policy[ratio])); close(fd); @@ -132,9 +133,7 @@ void eAVSwitch::setVideomode(int mode) char *pal="pal"; char *ntsc="ntsc"; int fd; - - return; - //FIXME: bug in driver (cannot set PAL) + if((fd = open("/proc/stb/video/videomode", O_WRONLY)) < 0) { printf("cannot open /proc/stb/video/videomode\n"); return; @@ -146,7 +145,24 @@ void eAVSwitch::setVideomode(int mode) case 1: write(fd, ntsc, strlen(ntsc)); break; - } + } + close(fd); +} + +void eAVSwitch::setWSS(int val) // 0 = auto, 1 = auto(4:3_off) +{ + int fd; + if((fd = open("/proc/stb/denc/0/wss", O_WRONLY)) < 0) { + printf("cannot open /proc/stb/denc/0/wss\n"); + return; + } + char *wss[] = { + "off", "auto", "auto(4:3_off)", "4:3_full_format", "16:9_full_format", + "14:9_letterbox_center", "14:9_letterbox_top", "16:9_letterbox_center", + "16:9_letterbox_top", ">16:9_letterbox_center", "14:9_full_format" + }; + write(fd, wss[val], strlen(wss[val])); +// eDebug("set wss to %s", wss[val]); close(fd); } @@ -157,8 +173,9 @@ void eAVSwitch::setSlowblank(int val) printf("cannot open /proc/stb/avs/0/sb\n"); return; } - const char *s = val ? "auto" : "vcr"; - write(fd, s, strlen(s)); + char *sb[] = {"0", "6", "12", "vcr", "auto"}; + write(fd, sb[val], strlen(sb[val])); +// eDebug("set slow blanking to %s", sb[val]); close(fd); } diff --git a/lib/driver/avswitch.h b/lib/driver/avswitch.h index ea45131..9c26b1a 100644 --- a/lib/driver/avswitch.h +++ b/lib/driver/avswitch.h @@ -21,7 +21,8 @@ public: void setAspectRatio(int ratio); void setVideomode(int mode); void setInput(int val); - void setSlowblank(int val); // 1: on, 0: off + void setSlowblank(int val); + void setWSS(int val); }; #endif diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py index d98f411..b4090c1 100644 --- a/lib/python/Components/AVSwitch.py +++ b/lib/python/Components/AVSwitch.py @@ -3,45 +3,66 @@ import os from enigma import * class AVSwitch: - INPUT = { "ENCODER": (0, 1), "SCART": (1, 0), "AUX": (2, 1) } - def __init__(self): - pass + INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) } + + def setInput(self, input): + eAVSwitch.getInstance().setInput(self.INPUT[input][0]) + if self.INPUT[input][1] == 4: + aspect = self.getAspectRatioSetting() + self.setWSS(aspect) + self.setSlowBlank(aspect) + else: + eAVSwitch.getInstance().setSlowblank(self.INPUT[input][1]) + # FIXME why do we have to reset the colorformat? bug in avs-driver? + eAVSwitch.getInstance().setColorFormat(config.av.colorformat.value) def setColorFormat(self, value): eAVSwitch.getInstance().setColorFormat(value) - + def setAspectRatio(self, value): eAVSwitch.getInstance().setAspectRatio(value) - self.checkWSS() + self.setWSS(value) + self.setSlowBlank(value) def setSystem(self, value): eAVSwitch.getInstance().setVideomode(value) - - def checkWSS(self): - if currentConfigSelectionElement(config.av.aspectratio) == "4_3_letterbox" or currentConfigSelectionElement(config.av.aspectratio) == "4_3_panscan": - writevalue = "4:3_full_format" - elif currentConfigSelectionElement(config.av.aspectratio) == "16_9": + + def getAspectRatioSetting(self): + valstr = currentConfigSelectionElement(config.av.aspectratio) + if valstr == "4_3_letterbox": + val = 0 + elif valstr == "4_3_panscan": + val = 1 + elif valstr == "16_9": + val = 2 + elif valstr == "16_9_always": + val = 3 + return val + + def setWSS(self, aspect=None): + if aspect is None: + aspect = self.getAspectRatioSetting() + if aspect == 0 or aspect == 1: # letterbox or panscan + value = 3 # 4:3_full_format + elif aspect == 2: # 16:9 if currentConfigSelectionElement(config.av.wss) == "off": - writevalue = "auto(4:3_off)" + value = 2 # auto(4:3_off) else: - writevalue = "auto" - elif currentConfigSelectionElement(config.av.aspectratio) == "16_9_always": - writevalue = "16:9_full_format" - try: - file = open("/proc/stb/denc/0/wss", "w") - file.write(writevalue) - file.close() - except: - print "[AVSwitch.py] Error writing to /proc/stb/denc/0/wss" - - def setWSS(self, value = None): - self.checkWSS() - - def setInput(self, input): - eAVSwitch.getInstance().setInput(self.INPUT[input][0]) - eAVSwitch.getInstance().setSlowblank(self.INPUT[input][1]) - # FIXME why do we have to reset the colorformat? bug in avs-driver? - eAVSwitch.getInstance().setColorFormat(config.av.colorformat.value) + value = 1 # auto + elif aspect == 3: # always 16:9 + value = 4 # 16:9_full_format + eAVSwitch.getInstance().setWSS(value) + + def setSlowBlank(self, aspect=None): + if aspect is None: + aspect = self.getAspectRatioSetting() + if aspect == 0 or aspect == 1: # letterbox or panscan + value = 2 # 12 V + elif aspect == 2: # 16:9 + value = 4 # auto + elif aspect == 3: # always 16:9 + value = 1 # 6V + eAVSwitch.getInstance().setSlowblank(value) def InitAVSwitch(): config.av = ConfigSubsection(); @@ -57,10 +78,13 @@ def InitAVSwitch(): def setColorFormat(configElement): iAVSwitch.setColorFormat(configElement.value) + def setAspectRatio(configElement): iAVSwitch.setAspectRatio(configElement.value) + def setSystem(configElement): iAVSwitch.setSystem(configElement.value) + def setWSS(configElement): iAVSwitch.setWSS(configElement.value) @@ -69,5 +93,5 @@ def InitAVSwitch(): config.av.aspectratio.addNotifier(setAspectRatio) config.av.tvsystem.addNotifier(setSystem) config.av.wss.addNotifier(setWSS) - + iAVSwitch.setInput("ENCODER") # init on startup \ No newline at end of file -- 2.7.4