Skip to content
Permalink
Browse files

Merge pull request #2386 from mathieui/irhotkeys

Add hotkeys to increase/decrease the IR
  • Loading branch information...
skidau committed May 12, 2015
2 parents 0533ecd + ea709b6 commit a6739c0960013d08131907055675a3cb95bc4af4
@@ -68,6 +68,9 @@ static const struct
{ "VolumeUp", 0, 0 /* wxMOD_NONE */ },
{ "VolumeToggleMute", 0, 0 /* wxMOD_NONE */ },

{ "IncreaseIR", 0, 0 /* wxMOD_NONE */ },
{ "DecreaseIR", 0, 0 /* wxMOD_NONE */ },

{ "ToggleIR", 0, 0 /* wxMOD_NONE */ },
{ "ToggleAspectRatio", 0, 0 /* wxMOD_NONE */ },
{ "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ },
@@ -39,6 +39,9 @@ enum Hotkey
HK_VOLUME_UP,
HK_VOLUME_TOGGLE_MUTE,

HK_INCREASE_IR,
HK_DECREASE_IR,

HK_TOGGLE_IR,
HK_TOGGLE_AR,
HK_TOGGLE_EFBCOPIES,
@@ -38,6 +38,9 @@ const std::string hotkey_labels[] =
_trans("Volume Up"),
_trans("Volume Toggle Mute"),

_trans("Increase IR"),
_trans("Decrease IR"),

_trans("Toggle IR"),
_trans("Toggle Aspect Ratio"),
_trans("Toggle EFB Copies"),
@@ -1353,6 +1353,18 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
if (++g_Config.iEFBScale > SCALE_4X)
g_Config.iEFBScale = SCALE_AUTO;
}
else if (IsHotkey(event, HK_INCREASE_IR))
{
OSDChoice = 1;
if (++g_Config.iEFBScale > SCALE_4X)
g_Config.iEFBScale = SCALE_4X;
}
else if (IsHotkey(event, HK_DECREASE_IR))
{
OSDChoice = 1;
if (--g_Config.iEFBScale < SCALE_1X)
g_Config.iEFBScale = SCALE_1X;
}
else if (IsHotkey(event, HK_TOGGLE_AR))
{
OSDChoice = 2;
@@ -203,6 +203,9 @@ const wxString hkText[] =
_("Volume Up"),
_("Volume Toggle Mute"),

_("Increase IR"),
_("Decrease IR"),

_("Toggle IR"),
_("Toggle Aspect Ratio"),
_("Toggle EFB Copies"),

0 comments on commit a6739c0

Please sign in to comment.
You can’t perform that action at this time.