X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fidvb.h;h=cff4dbb97e0c6a24eaf3e40c80fe1389878d4ff9;hp=ec016d6974925622d86b2b6e4195462874fd0c7f;hb=dafa266c71fd625cd5a9bedbea10a47e27c868ad;hpb=6e16107fdcc5f838f681d6f5d49e30124ebe5d74

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index ec016d6..cff4dbb 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -385,13 +385,13 @@ public:
 	
 	virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
 	
-	virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
+	virtual RESULT addService(const eServiceReferenceDVB &reference, eDVBService *service)=0;
 	virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
 	virtual RESULT flush()=0;
 
 	virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 
-	virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
+	virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q, const eServiceReference &source)=0;
 };
 
 #endif  // SWIG
@@ -490,7 +490,7 @@ class iDVBSatelliteEquipmentControl: public iObject
 public:
 	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int timeout)=0;
 	virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id, int *highest_score_lnb=0)=0;
-	virtual void setRotorMoving(bool)=0;
+	virtual void setRotorMoving(int slotid, bool)=0;
 };
 
 struct eDVBCIRouting
@@ -664,37 +664,24 @@ public:
 		/** Set Sync mode to either audio or video master */
 	virtual RESULT setSyncMaster(int who)=0;
 
-		/** Apply settings with starting video */
-	virtual RESULT start()=0;
-		/** Apply settings but don't start yet */
-	virtual RESULT preroll()=0;
+		/** Apply settings but don't change state */
+	virtual RESULT set()=0;
+		/* all those apply settings, then transition to the given state */
 
-		/** Freeze frame. Either continue decoding (without display) or halt. */
-	virtual RESULT freeze(int cont)=0;
-		/** Continue after freeze. */
-	virtual RESULT unfreeze()=0;
+		/** play */
+	virtual RESULT play()=0;
+		/** Freeze frame. */
+	virtual RESULT pause()=0;
 
 		/** fast forward by skipping frames. 0 is disabled, 2 is twice-the-speed, ... */
 	virtual RESULT setFastForward(int skip=0)=0;
 
-		// stop on .. Picture
-	enum { spm_I, spm_Ref, spm_Any };
-		/** Stop on specific decoded picture. For I-Frame display. */
-	virtual RESULT setSinglePictureMode(int when)=0;
-
-	enum { pkm_B, pkm_PB };
-		/** Fast forward by skipping either B or P/B pictures */
-	virtual RESULT setPictureSkipMode(int what)=0;
-
 		/** Slow Motion by repeating pictures */
 	virtual RESULT setSlowMotion(int repeat)=0;
-	
-	enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
-		/** Set Zoom. mode *must* be fitting. */
-	virtual RESULT setZoom(int what)=0;
-
-	virtual RESULT setTrickmode(int what) = 0;
 
+		/** Display any complete data as fast as possible */
+	virtual RESULT setTrickmode()=0;
+	
 	virtual RESULT getPTS(int what, pts_t &pts) = 0;
 
 	virtual RESULT showSinglePic(const char *filename) = 0;