From 391f7559e77cf98ea3b5a1fba94a8fa6f4307da8 Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Sat, 3 Dec 2005 21:16:59 +0000
Subject: add support for read signal quality, power and biterror rate from
 python

---
 lib/service/iservice.h     | 14 ++++++++++++++
 lib/service/servicedvb.cpp | 17 +++++++++++++++++
 lib/service/servicedvb.h   |  6 +++++-
 lib/service/servicemp3.cpp |  1 +
 lib/service/servicemp3.h   |  1 +
 5 files changed, 38 insertions(+), 1 deletion(-)

(limited to 'lib/service')

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 232e66f2..dfd06693 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -224,6 +224,19 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
 
+class iFrontendStatusInformation: public iObject
+{
+public:
+	enum {
+		bitErrorRate,
+		signalPower,
+		signalQuality
+	};
+	virtual int getFrontendInfo(int w)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr);
+
 class iPauseableService: public iObject
 {
 public:
@@ -287,6 +300,7 @@ public:
 	virtual SWIG_VOID(RESULT) pause(ePtr<iPauseableService> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) info(ePtr<iServiceInformation> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) audioTracks(ePtr<iAudioTrackSelection> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) frontendStatusInfo(ePtr<iFrontendStatusInformation> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 96f942ab..9e77a7a7 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -681,6 +681,12 @@ RESULT eDVBServicePlay::getPlayPosition(pts_t &pos)
 	return pvr_channel->getCurrentPosition(demux, pos);
 }
 
+RESULT eDVBServicePlay::frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
 RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
 {
 	ptr = this;
@@ -811,6 +817,17 @@ int eDVBServicePlay::selectAudioStream(int i)
 	return 0;
 }
 
+int eDVBServicePlay::getFrontendInfo(int w)
+{
+	eUsePtr<iDVBChannel> channel;
+	if(m_service_handler.getChannel(channel))
+		return 0;
+	ePtr<iDVBFrontend> fe;
+	if(channel->getFrontend(fe))
+		return 0;
+	return fe->readFrontendData(w);
+}
+
 DEFINE_REF(eDVBServicePlay)
 
 eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 44d920f8..4b6ef3e1 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -54,7 +54,7 @@ private:
 
 class eDVBServicePlay: public iPlayableService, public iPauseableService, 
 		public iSeekableService, public Object, public iServiceInformation, 
-		public iAudioTrackSelection
+		public iAudioTrackSelection, public iFrontendStatusInformation
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -68,6 +68,7 @@ public:
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT info(ePtr<iServiceInformation> &ptr);
 	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
+	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
 	
 		// iPauseableService
 	RESULT pause();
@@ -90,6 +91,9 @@ public:
 	RESULT selectTrack(unsigned int i);
 	RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
 
+		// iFrontendStatusInformation
+	int getFrontendInfo(int w);
+
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index dc038a85..8f999471 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -149,6 +149,7 @@ RESULT eServiceMP3::stop()
 RESULT eServiceMP3::pause(ePtr<iPauseableService> &ptr) { ptr=this; return 0; }
 RESULT eServiceMP3::seek(ePtr<iSeekableService> &ptr) { ptr = 0; return -1; }
 
+RESULT eServiceMP3::frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr) { ptr = 0; return -1; }
 RESULT eServiceMP3::audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = 0; return -1; };
 
 		// iPausableService
diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index bf18e92b..9f1a8e9f 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -58,6 +58,7 @@ public:
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT seek(ePtr<iSeekableService> &ptr);
 	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
+	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
 
 		// iPausableService
 	RESULT pause();
-- 
cgit v1.2.3