X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdriver%2Frc.h;h=529094682a27472f31a22efc771648f77dd6ee28;hp=1ce13c7241da2199c7f8f643fa10af2e637f49b7;hb=7199d3c37e7e7065bd6943702b5864fa5186b9a8;hpb=6a88cbc2bfa43b2a18eb896b3d635622da7e9d0a

diff --git a/lib/driver/rc.h b/lib/driver/rc.h
index 1ce13c7..5290946 100644
--- a/lib/driver/rc.h
+++ b/lib/driver/rc.h
@@ -12,6 +12,8 @@ class eRCInput;
 class eRCDriver;
 class eRCKey;
 
+#ifndef SWIG
+
 /**
  * \brief A remote control.
  *
@@ -39,7 +41,7 @@ public:
 	 * For Example, it might be 16bit codes with one bit make/break or special codes
 	 * for repeat.
 	 */
-	virtual void handleCode(int code)=0;
+	virtual void handleCode(long code)=0;
 	/**
 	 * \brief Get user readable description.
 	 * \result The description.
@@ -51,6 +53,7 @@ public:
 	 * \param key The key to get the description for.
 	 * \result User readable description of given key.
 	 */
+	virtual void setExclusive(bool b) { };
 };
 
 /**
@@ -87,13 +90,14 @@ public:
 	~eRCDriver();
 	
 	void enable(int en) { enabled=en; }
+	virtual void setExclusive(bool) { }
 };
 
 class eRCShortDriver: public eRCDriver
 {
 protected:
 	int handle;
-	eSocketNotifier *sn;
+	ePtr<eSocketNotifier> sn;
 	void keyPressed(int);
 public:
 	eRCShortDriver(const char *filename);
@@ -104,12 +108,13 @@ class eRCInputEventDriver: public eRCDriver
 {
 protected:
 	int handle;
-	eSocketNotifier *sn;
+	ePtr<eSocketNotifier> sn;
 	void keyPressed(int);
 public:
 	std::string getDeviceName();
 	eRCInputEventDriver(const char *filename);
 	~eRCInputEventDriver();
+	void setExclusive(bool b); // in exclusive mode data is not carried to console device
 };
 
 class eRCKey
@@ -124,10 +129,15 @@ public:
 	}
 	enum
 	{
+			/* there are not really flags.. */
+		flagMake=0,
 		flagBreak=1,
-		flagRepeat=2
+		flagRepeat=2,
+		flagLong=3,
+			/* but this is. */
+		flagAscii=4,
 	};
-	
+
 	bool operator<(const eRCKey &r) const
 	{
 		if (r.producer == producer)
@@ -161,13 +171,18 @@ public:
 		rrate;		// repeat rate (in ms)
 };
 
+#endif
+
 class eRCInput: public Object
 {
 	int locked;	
-	int handle;
 	static eRCInput *instance;
 	int keyboardMode;
-
+#ifdef SWIG
+	eRCInput();
+	~eRCInput();
+public:
+#else
 public:
 	struct lstr
 	{
@@ -182,15 +197,10 @@ public:
 	Signal1<void, const eRCKey&> keyEvent;
 	eRCInput();
 	~eRCInput();
-	
-	int lock();
-	void unlock();
-	int islocked() { return locked; }
+
 	void close();
 	bool open();
 
-	void setFile(int handle);
-
 	/* This is only relevant for "keyboard"-styled input devices,
 	   i.e. not plain remote controls. It's up to the input device
 	   driver to decide wheter an input device is a keyboard or
@@ -210,10 +220,6 @@ public:
 	   lock the console and pass this as the console fd for making the
 	   tc* stuff working.
 	*/
-	
-	enum { kmNone, kmAscii, kmAll };
-	void setKeyboardMode(int mode) { keyboardMode = mode; }
-	int  getKeyboardMode() { return keyboardMode; }
 
 	void keyPressed(const eRCKey &key)
 	{
@@ -224,10 +230,16 @@ public:
 	void removeDevice(const std::string &id);
 	eRCDevice *getDevice(const std::string &id);
 	std::map<std::string,eRCDevice*,lstr> &getDevices();
-	
-	static eRCInput *getInstance() { return instance; }
-	
+
 	eRCConfig config;
+#endif
+	enum { kmNone, kmAscii, kmAll };
+	void setKeyboardMode(int mode) { keyboardMode = mode; }
+	int  getKeyboardMode() { return keyboardMode; }
+	static eRCInput *getInstance() { return instance; }
+	void lock();
+	void unlock();
+	int islocked() { return locked; }
 };
 
 #endif