From d5187c8c85adf28d56684123583a8ba99031814c Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Sat, 12 May 2012 13:11:52 +0300 Subject: [PATCH] Framehold: Add corresponding hotkeys and fix spurious autohold signal --- src/core/controller.cpp | 6 ++++++ src/core/controllerframe.cpp | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index cfd6398e..81143594 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -222,6 +222,12 @@ namespace our_commands.insert(new button_action(x.str(), j, k, y.str())); if(j == 0) our_icommands.insert(new inverse_key(x.str(), expx.str())); + if(j == 2) + our_icommands.insert(new inverse_key(x.str(), expx.str() + + " (hold)")); + if(j == 3) + our_icommands.insert(new inverse_key(x.str(), expx.str() + + " (typed)")); } for(unsigned k = 0; k < 8; ++k) { stringfmt x, expx; diff --git a/src/core/controllerframe.cpp b/src/core/controllerframe.cpp index 51fff196..38ea0b33 100644 --- a/src/core/controllerframe.cpp +++ b/src/core/controllerframe.cpp @@ -854,7 +854,6 @@ void controller_state::reset_framehold() throw() void controller_state::framehold(unsigned pcid, unsigned pbid, bool newstate) throw() { _framehold.axis(pcid, pbid, newstate ? 1 : 0); - information_dispatch::do_autohold_update(pcid, pbid, newstate); } bool controller_state::framehold(unsigned pcid, unsigned pbid) throw()