From: Felix Domke Date: Tue, 17 May 2005 01:49:31 +0000 (+0000) Subject: - removed some OOOOOLD, never required code (last time it was used was in 2001(!)) X-Git-Tag: 2.6.0~5854 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/41ede5ef8052385661577e28e2f3c96c9377c4ee - removed some OOOOOLD, never required code (last time it was used was in 2001(!)) --- diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp index 39206512..f1df5493 100644 --- a/lib/driver/rc.cpp +++ b/lib/driver/rc.cpp @@ -35,11 +35,6 @@ * actions. have fun. */ -int eRCDevice::getKeyCompatibleCode(const eRCKey &) const -{ - return -1; -} - eRCDevice::eRCDevice(std::string id, eRCDriver *driver): driver(driver), id(id) { input=driver->getInput(); diff --git a/lib/driver/rc.h b/lib/driver/rc.h index 8d932f8e..7b735962 100644 --- a/lib/driver/rc.h +++ b/lib/driver/rc.h @@ -51,15 +51,6 @@ public: * \param key The key to get the description for. * \result User readable description of given key. */ - virtual const char *getKeyDescription(const eRCKey &key) const=0; - /** - * \brief Get a dbox2-compatible keycode. - * - * THIS IS DEPRECATED! DON'T USE IT UNLESS YOU NEED IT! - * \param key The key to get the compatible code for. - * \result The dbox2-compatible code. (new RC as defined in enum). - */ - virtual int getKeyCompatibleCode(const eRCKey &key) const; }; /** @@ -188,15 +179,6 @@ protected: std::map devices; public: Signal1 keyEvent; - enum - { - RC_0=0, RC_1=0x1, RC_2=0x2, RC_3=0x3, RC_4=0x4, RC_5=0x5, RC_6=0x6, RC_7=0x7, - RC_8=0x8, RC_9=0x9, - RC_RIGHT=10, RC_LEFT=11, RC_UP=12, RC_DOWN=13, RC_OK=14, RC_MUTE=15, - RC_STANDBY=16, RC_GREEN=17, RC_YELLOW=18, RC_RED=19, RC_BLUE=20, RC_PLUS=21, RC_MINUS=22, - RC_HELP=23, RC_DBOX=24, - RC_UP_LEFT=27, RC_UP_RIGHT=28, RC_DOWN_LEFT=29, RC_DOWN_RIGHT=30, RC_HOME=31 - }; eRCInput(); ~eRCInput(); diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp index 58cc9afc..ad2d3f61 100644 --- a/lib/driver/rcinput.cpp +++ b/lib/driver/rcinput.cpp @@ -40,81 +40,6 @@ const char *eRCDeviceInputDev::getDescription() const return id.c_str(); } -const char *eRCDeviceInputDev::getKeyDescription(const eRCKey &key) const -{ - switch (key.code) - { - case KEY_0: return "0"; - case KEY_1: return "1"; - case KEY_2: return "2"; - case KEY_3: return "3"; - case KEY_4: return "4"; - case KEY_5: return "5"; - case KEY_6: return "6"; - case KEY_7: return "7"; - case KEY_8: return "8"; - case KEY_9: return "9"; - case KEY_RIGHT: return "rechts"; - case KEY_LEFT: return "links"; - case KEY_UP: return "oben"; - case KEY_DOWN: return "unten"; - case KEY_OK: return "ok"; - case KEY_MUTE: return "mute"; - case KEY_POWER: return "power"; - case KEY_GREEN: return "gruen"; - case KEY_YELLOW: return "gelb"; - case KEY_RED: return "rot"; - case KEY_BLUE: return "blau"; - case KEY_VOLUMEUP: return "Lautstaerke plus"; - case KEY_VOLUMEDOWN: return "Lautstaerke minus"; - case KEY_HELP: return "?"; - case KEY_SETUP: return "d-Box"; -#if 0 - case KEY_TOPLEFT: return "oben links"; - case KEY_TOPRIGHT: return "oben rechts"; - case KEY_BOTTOMLEFT: return "unten links"; - case KEY_BOTTOMRIGHT: return "unten rechts"; -#endif - case KEY_HOME: return "home"; - default: return 0; - } -} - -int eRCDeviceInputDev::getKeyCompatibleCode(const eRCKey &key) const -{ - switch (key.code) - { - case KEY_0: return eRCInput::RC_0; - case KEY_1: return eRCInput::RC_1; - case KEY_2: return eRCInput::RC_2; - case KEY_3: return eRCInput::RC_3; - case KEY_4: return eRCInput::RC_4; - case KEY_5: return eRCInput::RC_5; - case KEY_6: return eRCInput::RC_6; - case KEY_7: return eRCInput::RC_7; - case KEY_8: return eRCInput::RC_8; - case KEY_9: return eRCInput::RC_9; - case KEY_RIGHT: return eRCInput::RC_RIGHT; - case KEY_LEFT: return eRCInput::RC_LEFT; - case KEY_UP: return eRCInput::RC_UP; - case KEY_DOWN: return eRCInput::RC_DOWN; - case KEY_OK: return eRCInput::RC_OK; - case KEY_MUTE: return eRCInput::RC_MUTE; - case KEY_POWER: return eRCInput::RC_STANDBY; - case KEY_GREEN: return eRCInput::RC_GREEN; - case KEY_YELLOW: return eRCInput::RC_YELLOW; - case KEY_RED: return eRCInput::RC_RED; - case KEY_VOLUMEUP: return eRCInput::RC_PLUS; - case KEY_BLUE: return eRCInput::RC_BLUE; - case KEY_VOLUMEDOWN: return eRCInput::RC_MINUS; - case KEY_HELP: return eRCInput::RC_HELP; - case KEY_SETUP: return eRCInput::RC_DBOX; - case KEY_HOME: return eRCInput::RC_HOME; - } - return -1; -} - - class eInputDeviceInit { ePtrList m_drivers; diff --git a/lib/driver/rcinput.h b/lib/driver/rcinput.h index c13eafb1..6c180170 100644 --- a/lib/driver/rcinput.h +++ b/lib/driver/rcinput.h @@ -9,9 +9,6 @@ public: void handleCode(int code); eRCDeviceInputDev(eRCInputEventDriver *driver); const char *getDescription() const; - - const char *getKeyDescription(const eRCKey &key) const; - int getKeyCompatibleCode(const eRCKey &key) const; }; #endif