X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdriver%2Favswitch.cpp;h=dbfebf5f2e15ee0d45a9ffe506bd4478ff338a6c;hp=e9f2ece545065f0e9d4dc4c9b43dbf60b1dc9427;hb=10e7e45ae92d4fe06f70126ed256b87896dbc432;hpb=923e3c65222946ad216cbf646b661e435a724209;ds=sidebyside

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index e9f2ece..dbfebf5 100644
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <string.h>
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
@@ -23,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);
 	}
 }
@@ -45,7 +46,14 @@ int eAVSwitch::getVCRSlowBlanking()
 	int val=0;
 	if (m_fp_fd >= 0)
 	{
-		if (ioctl(m_fp_fd, FP_IOCTL_GET_VCR, &val) < 0)
+		FILE *f = fopen("/proc/stb/fp/vcr_fns", "r");
+		if (f)
+		{
+			if (fscanf(f, "%d", &val) != 1)
+				eDebug("read /proc/stb/fp/vcr_fns failed!! (%m)");
+			fclose(f);
+		}
+		else if (ioctl(m_fp_fd, FP_IOCTL_GET_VCR, &val) < 0)
 			eDebug("FP_GET_VCR failed (%m)");
 	}
 	return val;
@@ -60,11 +68,24 @@ void eAVSwitch::fp_event(int what)
 	}
 	else
 	{
-		int val = FP_EVENT_VCR_SB_CHANGED;  // ask only for this event
-		if (ioctl(m_fp_fd, FP_IOCTL_GET_EVENT, &val) < 0)
-			eDebug("FP_IOCTL_GET_EVENT failed (%m)");
-		else if (val & FP_EVENT_VCR_SB_CHANGED)
-			/* emit */ vcr_sb_notifier(getVCRSlowBlanking());
+		FILE *f = fopen("/proc/stb/fp/events", "r");
+		if (f)
+		{
+			int events;
+			if (fscanf(f, "%d", &events) != 1)
+				eDebug("read /proc/stb/fp/events failed!! (%m)");
+			else if (events & FP_EVENT_VCR_SB_CHANGED)
+				/* emit */ vcr_sb_notifier(getVCRSlowBlanking());
+			fclose(f);
+		}
+		else
+		{
+			int val = FP_EVENT_VCR_SB_CHANGED;  // ask only for this event
+			if (ioctl(m_fp_fd, FP_IOCTL_GET_EVENT, &val) < 0)
+				eDebug("FP_IOCTL_GET_EVENT failed (%m)");
+			else if (val & FP_EVENT_VCR_SB_CHANGED)
+				/* emit */ vcr_sb_notifier(getVCRSlowBlanking());
+		}
 	}
 }
 
@@ -72,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()
@@ -81,6 +100,19 @@ eAVSwitch *eAVSwitch::getInstance()
 	return instance;
 }
 
+bool eAVSwitch::haveScartSwitch()
+{
+	char tmp[255];
+	int fd = open("/proc/stb/avs/0/input_choices", O_RDONLY);
+	if(fd < 0) {
+		eDebug("cannot open /proc/stb/avs/0/input_choices");
+		return false;
+	}
+	read(fd, tmp, 255);
+	close(fd);
+	return !!strstr(tmp, "scart");
+}
+
 void eAVSwitch::setInput(int val)
 {
 	/*
@@ -89,12 +121,12 @@ void eAVSwitch::setInput(int val)
 	2-aux
 	*/
 
-	char *input[] = {"encoder", "scart", "aux"};
+	const char *input[] = {"encoder", "scart", "aux"};
 
 	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;
 	}
 
@@ -108,10 +140,10 @@ void eAVSwitch::setInput(int val)
 void eAVSwitch::setFastBlank(int val)
 {
 	int fd;
-	char *fb[] = {"low", "high", "vcr"};
+	const 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;
 	}
 
@@ -126,10 +158,10 @@ void eAVSwitch::setColorFormat(int format)
 	1-RGB
 	2-S-Video
 	*/
-	char *cvbs="cvbs";
-	char *rgb="rgb";
-	char *svideo="svideo";
-	char *yuv="yuv";
+	const char *cvbs="cvbs";
+	const char *rgb="rgb";
+	const char *svideo="svideo";
+	const char *yuv="yuv";
 	int fd;
 	
 	if((fd = open("/proc/stb/avs/0/colorformat", O_WRONLY)) < 0) {
@@ -164,12 +196,12 @@ void eAVSwitch::setAspectRatio(int ratio)
 	5-16:10 PanScan
 	6-16:9 forced ("letterbox")
 	*/
-	char *aspect[] = {"4:3", "4:3", "any", "16:9", "16:10", "16:10", "16:9", "16:9"};
-	char *policy[] = {"letterbox", "panscan", "bestfit", "panscan", "letterbox", "panscan", "letterbox"};
+	const char *aspect[] = {"4:3", "4:3", "any", "16:9", "16:10", "16:10", "16:9", "16:9"};
+	const char *policy[] = {"letterbox", "panscan", "bestfit", "panscan", "letterbox", "panscan", "letterbox"};
 
 	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]);
@@ -177,7 +209,7 @@ void eAVSwitch::setAspectRatio(int ratio)
 	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]);
@@ -188,27 +220,49 @@ void eAVSwitch::setAspectRatio(int ratio)
 
 void eAVSwitch::setVideomode(int mode)
 {
-	char *pal="pal";
-	char *ntsc="ntsc";
+	const char *pal="pal";
+	const char *ntsc="ntsc";
 	
 	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;
 }
@@ -217,10 +271,10 @@ 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");
+		eDebug("cannot open /proc/stb/denc/0/wss");
 		return;
 	}
-	char *wss[] = {
+	const 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"
@@ -234,10 +288,10 @@ void eAVSwitch::setSlowblank(int val)
 {
 	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"};
+	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);