aboutsummaryrefslogtreecommitdiff
path: root/lib/actions/action.h
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-11-16 19:58:44 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-11-16 19:58:44 +0000
commit1145369cb70d505ebca614e5e8247b2d59defd48 (patch)
tree69c5b478c7d7a88bc67eb88d996203eaa83f97cc /lib/actions/action.h
parent7b823bac7983b1d13e49bf8243d6dc6244f29965 (diff)
downloadenigma2-1145369cb70d505ebca614e5e8247b2d59defd48.tar.gz
enigma2-1145369cb70d505ebca614e5e8247b2d59defd48.zip
take device string into account
Diffstat (limited to 'lib/actions/action.h')
-rw-r--r--lib/actions/action.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/actions/action.h b/lib/actions/action.h
index e43e48a7..560fdbbf 100644
--- a/lib/actions/action.h
+++ b/lib/actions/action.h
@@ -34,7 +34,7 @@ public:
void bindKey(const std::string &device, int key, int flags, const std::string &context, const std::string &action);
- void keyPressed(int device, int key, int flags);
+ void keyPressed(const std::string &device, int key, int flags);
static RESULT getInstance(ePtr<eActionMap> &ptr);
#ifndef SWIG
@@ -56,7 +56,7 @@ private:
friend struct compare_string_keybind_native;
struct eNativeKeyBinding
{
- int m_device;
+ std::string m_device;
int m_key;
int m_flags;
@@ -69,7 +69,7 @@ private:
friend struct compare_string_keybind_python;
struct ePythonKeyBinding
{
- int m_device;
+ std::string m_device;
int m_key;
int m_flags;