Merge branch 'bug_538_ignore_global_actions_in_standby'

[enigma2.git] / lib / driver / avswitch.cpp

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index 1f2765ec1fdd75918720198a8e3026794459d45a..f05bdd9551b27f0baca3c3082f6fd36df2c7a61c 100644 (file)
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -24,7 +24,7 @@ eAVSwitch::eAVSwitch()
        }
        else
        {
-               m_fp_notifier = new eSocketNotifier(eApp, m_fp_fd, eSocketNotifier::Read|POLLERR);
+               m_fp_notifier = eSocketNotifier::create(eApp, m_fp_fd, eSocketNotifier::Read|POLLERR);
                CONNECT(m_fp_notifier->activated, eAVSwitch::fp_event);
        }
 }
@@ -93,8 +93,6 @@ eAVSwitch::~eAVSwitch()
 {
        if ( m_fp_fd >= 0 )
                close(m_fp_fd);
-       if (m_fp_notifier)
-               delete m_fp_notifier;
 }
 
 eAVSwitch *eAVSwitch::getInstance()
@@ -134,23 +132,6 @@ void eAVSwitch::setInput(int val)
 
        write(fd, input[val], strlen(input[val]));
        close(fd);
-       
-       if (val == 1)
-               setFastBlank(2);
-}
-
-void eAVSwitch::setFastBlank(int val)
-{
-       int fd;
-       const char *fb[] = {"low", "high", "vcr"};
-
-       if((fd = open("/proc/stb/avs/0/fb", O_WRONLY)) < 0) {
-               eDebug("cannot open /proc/stb/avs/0/fb");
-               return;
-       }
-
-       write(fd, fb[val], strlen(fb[0]));
-       close(fd);
 }
 
 void eAVSwitch::setColorFormat(int format)
@@ -286,18 +267,5 @@ void eAVSwitch::setWSS(int val) // 0 = auto, 1 = auto(4:3_off)
        close(fd);
 }
 
-void eAVSwitch::setSlowblank(int val)
-{
-       int fd;
-       if((fd = open("/proc/stb/avs/0/sb", O_WRONLY)) < 0) {
-               eDebug("cannot open /proc/stb/avs/0/sb");
-               return;
-       }
-       const char *sb[] = {"0", "6", "12", "vcr", "auto"};
-       write(fd, sb[val], strlen(sb[val]));
-//     eDebug("set slow blanking to %s", sb[val]);
-       close(fd);
-}
-
 //FIXME: correct "run/startlevel"
 eAutoInitP0<eAVSwitch> init_avswitch(eAutoInitNumbers::rc, "AVSwitch Driver");