X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d22f9d877f4338d90886f354db15e85a37d5044d..1dbaf81816d8994a84716bf1f8ca34645206ae22:/lib/driver/avswitch.cpp

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index 8110049b..e9f2ece5 100644
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -1,5 +1,3 @@
-#include <lib/driver/avswitch.h>
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -7,6 +5,8 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/base/eerror.h>
+#include <lib/base/ebase.h>
+#include <lib/driver/avswitch.h>
 
 eAVSwitch *eAVSwitch::instance = 0;
 
@@ -15,10 +15,65 @@ eAVSwitch::eAVSwitch()
 	ASSERT(!instance);
 	instance = this;
 	m_video_mode = 0;
+	m_fp_fd = open("/dev/dbox/fp0", O_RDONLY|O_NONBLOCK);
+	if (m_fp_fd == -1)
+	{
+		eDebug("couldnt open /dev/dbox/fp0 to monitor vcr scart slow blanking changed!");
+		m_fp_notifier=0;
+	}
+	else
+	{
+		m_fp_notifier = new eSocketNotifier(eApp, m_fp_fd, eSocketNotifier::Read|POLLERR);
+		CONNECT(m_fp_notifier->activated, eAVSwitch::fp_event);
+	}
+}
+
+#ifndef FP_IOCTL_GET_EVENT
+#define FP_IOCTL_GET_EVENT 20
+#endif
+
+#ifndef FP_IOCTL_GET_VCR
+#define FP_IOCTL_GET_VCR 7
+#endif
+
+#ifndef FP_EVENT_VCR_SB_CHANGED
+#define FP_EVENT_VCR_SB_CHANGED 1
+#endif
+
+int eAVSwitch::getVCRSlowBlanking()
+{
+	int val=0;
+	if (m_fp_fd >= 0)
+	{
+		if (ioctl(m_fp_fd, FP_IOCTL_GET_VCR, &val) < 0)
+			eDebug("FP_GET_VCR failed (%m)");
+	}
+	return val;
+}
+
+void eAVSwitch::fp_event(int what)
+{
+	if (what & POLLERR) // driver not ready for fp polling
+	{
+		eDebug("fp driver not read for polling.. so disable polling");
+		m_fp_notifier->stop();
+	}
+	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());
+	}
 }
 
 eAVSwitch::~eAVSwitch()
 {
+	if ( m_fp_fd >= 0 )
+		close(m_fp_fd);
+	if (m_fp_notifier)
+		delete m_fp_notifier;
 }
 
 eAVSwitch *eAVSwitch::getInstance()
@@ -104,11 +159,13 @@ void eAVSwitch::setAspectRatio(int ratio)
 	0-4:3 Letterbox
 	1-4:3 PanScan
 	2-16:9
-	3-16:9 forced
+	3-16:9 forced ("panscan")
+	4-16:10 Letterbox
+	5-16:10 PanScan
+	6-16:9 forced ("letterbox")
 	*/
-	
-	char *aspect[] = {"4:3", "4:3", "any", "16:9"};
-	char *policy[] = {"letterbox", "panscan", "bestfit", "panscan"};
+	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"};
 
 	int fd;
 	if((fd = open("/proc/stb/video/aspect", O_WRONLY)) < 0) {