Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

	lib/dvb/decoder.cpp

2 files changed, 0 insertions, 32 deletions

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index dbfebf5f..f05bdd95 100644
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -132,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)
@@ -284,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");
diff --git a/lib/driver/avswitch.h b/lib/driver/avswitch.h
index 8fdafdd1..bcb29c40 100644
--- a/lib/driver/avswitch.h
+++ b/lib/driver/avswitch.h
@@ -26,12 +26,10 @@ public:
 	static eAVSwitch *getInstance();
 	bool haveScartSwitch();
 	int getVCRSlowBlanking();
-	void setFastBlank(int val);
 	void setColorFormat(int format);
 	void setAspectRatio(int ratio);
 	void setVideomode(int mode);
 	void setInput(int val);
-	void setSlowblank(int val);
 	void setWSS(int val);
 	PSignal1<void, int> vcr_sb_notifier;
 };