X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d808bfeb8d8e2ef78641655b741be4d9b258b20d..d04e6435efecf42a192a4f6c71dca9a1a053d5fb:/lib/driver/avswitch.cpp diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp index 1f2765ec..f05bdd95 100644 --- 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 init_avswitch(eAutoInitNumbers::rc, "AVSwitch Driver");