git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
take device string into account
[enigma2.git]
/
lib
/
actions
/
action.h
diff --git
a/lib/actions/action.h
b/lib/actions/action.h
index e43e48a74e64488fd5f12185791058555d86c0b1..560fdbbfc487a3734c6017f5e1aa7f0f5c6d4224 100644
(file)
--- 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 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
static RESULT getInstance(ePtr<eActionMap> &ptr);
#ifndef SWIG
@@
-56,7
+56,7
@@
private:
friend struct compare_string_keybind_native;
struct eNativeKeyBinding
{
friend struct compare_string_keybind_native;
struct eNativeKeyBinding
{
-
int
m_device;
+
std::string
m_device;
int m_key;
int m_flags;
int m_key;
int m_flags;
@@
-69,7
+69,7
@@
private:
friend struct compare_string_keybind_python;
struct ePythonKeyBinding
{
friend struct compare_string_keybind_python;
struct ePythonKeyBinding
{
-
int
m_device;
+
std::string
m_device;
int m_key;
int m_flags;
int m_key;
int m_flags;