X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2c69b1c3a49b8b03866894fe3e3f3a4f330f517..40d11af2de7aed77c90970ba2b61dd754a225117:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a6a19fff..13f20081 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -162,6 +162,20 @@ struct eServiceReferenceDVB: public eServiceReference
 	eTransportStreamID getParentTransportStreamID() const { return eTransportStreamID(data[6]); }
 	void setParentTransportStreamID( eTransportStreamID tsid ) { data[6]=tsid.get(); }
 
+	eServiceReferenceDVB getParentServiceReference() const
+	{
+		eServiceReferenceDVB tmp(*this);
+		if (data[4] && data[5])
+		{
+			tmp.data[1] = data[5];
+			tmp.data[2] = data[6];
+			tmp.data[5] = tmp.data[6] = 0;
+		}
+		else
+			tmp.type = idInvalid;
+		return tmp;
+	}
+
 	eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
 		:eServiceReference(eServiceReference::idDVB, 0)
 	{
@@ -323,16 +337,19 @@ public:
 
 class eDVBDiseqcCommand
 {
+#ifndef SWIG
 public:
+#endif
 	int len;
-#ifndef SWIG
 	__u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
 	int tone;
 	int voltage;
 #endif
-#endif //SWIG
-	void setData(const char *str);
+#ifdef SWIG
+public:
+#endif
+	void setCommandString(const char *str);
 };
 
 class iDVBSatelliteEquipmentControl;
@@ -344,7 +361,7 @@ public:
 	enum {
 		feSatellite, feCable, feTerrestrial
 	};
-	virtual RESULT getFrontendType(int &type)=0;
+	virtual RESULT getFrontendType(int &SWIG_OUTPUT)=0;
 	virtual RESULT tune(const iDVBFrontendParameters &where)=0;
 #ifndef SWIG
 	virtual RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)=0;
@@ -356,7 +373,7 @@ public:
 		stateLock = 3,
 		stateLostLock = 4,
 	};
-	virtual RESULT getState(int &state)=0;
+	virtual RESULT getState(int &SWIG_OUTPUT)=0;
 	enum {
 		toneOff, toneOn
 	};
@@ -414,10 +431,10 @@ public:
 		state_last_instance, /* just one reference to this channel is left */
 		state_release      /* channel is being shut down. */
 	};
-	virtual RESULT getState(int &state)=0;	
+	virtual RESULT getState(int &SWIG_OUTPUT)=0;	
 
 		/* direct frontend access for raw channels and/or status inquiries. */
-	virtual RESULT getFrontend(ePtr<iDVBFrontend> &frontend)=0;
+	virtual RESULT getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
 
 #ifndef SWIG
 	virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
@@ -442,7 +459,7 @@ public:
 	virtual void ReleaseUse() = 0;
 #endif
 };
-TEMPLATE_TYPEDEF(ePtr<iDVBChannel>, iDVBChannelPtr);
+TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);
 
 #ifndef SWIG