add possibility to select multimode instead of pal/ntsc for TVs with support

for both tv systems

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index e9f2ece545065f0e9d4dc4c9b43dbf60b1dc9427..d582db81ae3ca90bf33b25158e2e75f616b4af60 100644 (file)
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -94,7 +94,7 @@ void eAVSwitch::setInput(int val)
        int fd;
        
        if((fd = open("/proc/stb/avs/0/input", O_WRONLY)) < 0) {
        int fd;
        
        if((fd = open("/proc/stb/avs/0/input", O_WRONLY)) < 0) {

-               printf("cannot open /proc/stb/avs/0/input\n");
+               eDebug("cannot open /proc/stb/avs/0/input");

                return;
        }
 
                return;
        }
 


@@ -111,7 +111,7 @@ void eAVSwitch::setFastBlank(int val)
        char *fb[] = {"low", "high", "vcr"};
 
        if((fd = open("/proc/stb/avs/0/fb", O_WRONLY)) < 0) {
        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");
+               eDebug("cannot open /proc/stb/avs/0/fb");

                return;
        }
 
                return;
        }
 


@@ -169,7 +169,7 @@ void eAVSwitch::setAspectRatio(int ratio)
 
        int fd;
        if((fd = open("/proc/stb/video/aspect", O_WRONLY)) < 0) {
 
        int fd;
        if((fd = open("/proc/stb/video/aspect", O_WRONLY)) < 0) {

-               printf("cannot open /proc/stb/video/aspect\n");
+               eDebug("cannot open /proc/stb/video/aspect");

                return;
        }
 //     eDebug("set aspect to %s", aspect[ratio]);
                return;
        }
 //     eDebug("set aspect to %s", aspect[ratio]);


@@ -177,7 +177,7 @@ void eAVSwitch::setAspectRatio(int ratio)
        close(fd);
 
        if((fd = open("/proc/stb/video/policy", O_WRONLY)) < 0) {
        close(fd);
 
        if((fd = open("/proc/stb/video/policy", O_WRONLY)) < 0) {

-               printf("cannot open /proc/stb/video/policy\n");
+               eDebug("cannot open /proc/stb/video/policy");

                return;
        }
 //     eDebug("set ratio to %s", policy[ratio]);
                return;
        }
 //     eDebug("set ratio to %s", policy[ratio]);


@@ -193,22 +193,44 @@ void eAVSwitch::setVideomode(int mode)
        
        if (mode == m_video_mode)
                return;
        
        if (mode == m_video_mode)
                return;

-       
-       int fd;

 
 

-       if((fd = open("/proc/stb/video/videomode", O_WRONLY)) < 0) {
-               printf("cannot open /proc/stb/video/videomode\n");
-               return;
+       if (mode == 2)
+       {
+               int fd1 = open("/proc/stb/video/videomode_50hz", O_WRONLY);
+               if(fd1 < 0) {
+                       eDebug("cannot open /proc/stb/video/videomode_50hz");
+                       return;
+               }
+               int fd2 = open("/proc/stb/video/videomode_60hz", O_WRONLY);
+               if(fd2 < 0) {
+                       eDebug("cannot open /proc/stb/video/videomode_60hz");
+                       close(fd1);
+                       return;
+               }
+               write(fd1, pal, strlen(pal));
+               write(fd2, ntsc, strlen(ntsc));
+               close(fd1);
+               close(fd2);

        }
        }

-       switch(mode) {
-               case 0:
-                       write(fd, pal, strlen(pal));
-                       break;
-               case 1:
-                       write(fd, ntsc, strlen(ntsc));
-                       break;
+       else
+       {
+               int fd = open("/proc/stb/video/videomode", O_WRONLY);
+               if(fd < 0) {
+                       eDebug("cannot open /proc/stb/video/videomode");
+                       return;
+               }
+               switch(mode) {
+                       case 0:
+                               write(fd, pal, strlen(pal));
+                               break;
+                       case 1:
+                               write(fd, ntsc, strlen(ntsc));
+                               break;
+                       default:
+                               eDebug("unknown videomode %d", mode);
+               }
+               close(fd);

        }
        }

-       close(fd);

 
        m_video_mode = mode;
 }
 
        m_video_mode = mode;
 }


@@ -217,7 +239,7 @@ 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) {
 {
        int fd;
        if((fd = open("/proc/stb/denc/0/wss", O_WRONLY)) < 0) {

-               printf("cannot open /proc/stb/denc/0/wss\n");
+               eDebug("cannot open /proc/stb/denc/0/wss");

                return;
        }
        char *wss[] = {
                return;
        }
        char *wss[] = {


@@ -234,7 +256,7 @@ void eAVSwitch::setSlowblank(int val)
 {
        int fd;
        if((fd = open("/proc/stb/avs/0/sb", O_WRONLY)) < 0) {
 {
        int fd;
        if((fd = open("/proc/stb/avs/0/sb", O_WRONLY)) < 0) {

-               printf("cannot open /proc/stb/avs/0/sb\n");
+               eDebug("cannot open /proc/stb/avs/0/sb");

                return;
        }
        char *sb[] = {"0", "6", "12", "vcr", "auto"};
                return;
        }
        char *sb[] = {"0", "6", "12", "vcr", "auto"};

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 33045d403ecf74fa851dddbd47a496998ba15c67..8a7bd8d1e3e6b69f3e27a501c0e7bbef95f577c8 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -89,7 +89,7 @@ def InitAVSwitch():
                        "16_10_letterbox": _("16:10 Letterbox"),
                        "16_10_panscan": _("16:10 PanScan")}, 
                        default = "4_3_letterbox")
                        "16_10_letterbox": _("16:10 Letterbox"),
                        "16_10_panscan": _("16:10 PanScan")}, 
                        default = "4_3_letterbox")

-       config.av.tvsystem = ConfigSelection(choices = {"pal": _("PAL"), "ntsc": _("NTSC")}, default="pal")
+       config.av.tvsystem = ConfigSelection(choices = {"pal": _("PAL"), "ntsc": _("NTSC"), "multinorm": _("multinorm")}, default="pal")

        config.av.wss = ConfigEnableDisable(default = True)
        config.av.defaultac3 = ConfigYesNo(default = False)
        config.av.vcrswitch = ConfigEnableDisable(default = False)
        config.av.wss = ConfigEnableDisable(default = True)
        config.av.defaultac3 = ConfigYesNo(default = False)
        config.av.vcrswitch = ConfigEnableDisable(default = False)


@@ -105,7 +105,7 @@ def InitAVSwitch():
                iAVSwitch.setAspectRatio(map[configElement.value])
 
        def setSystem(configElement):
                iAVSwitch.setAspectRatio(map[configElement.value])
 
        def setSystem(configElement):

-               map = {"pal": 0, "ntsc": 1}
+               map = {"pal": 0, "ntsc": 1, "multinorm" : 2}

                iAVSwitch.setSystem(map[configElement.value])
 
        def setWSS(configElement):
                iAVSwitch.setSystem(map[configElement.value])
 
        def setWSS(configElement):