This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit 7c8f5cdd authored by alex@thinkpad's avatar alex@thinkpad
Browse files

700D, 650D, 100D: updated GUIMODE_ML_MENU definition to allow scrollwheel...

700D, 650D, 100D: updated GUIMODE_ML_MENU definition to allow scrollwheel controls when browsing ML menu while recording H.264
EOS M: updated GUIMODE_ML_MENU to use the same underlying dialogs

https://www.magiclantern.fm/forum/index.php?topic=7473.msg205350#msg205350
https://www.magiclantern.fm/forum/index.php?topic=9741.msg205358#msg205358
https://www.magiclantern.fm/forum/index.php?topic=16040.msg205389#msg205389

--HG--
branch : lua_fix
parent 6147d5a9eb48
......@@ -172,8 +172,10 @@
#define DISPLAY_TRAP_FOCUS_MSG_BLANK " "
// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 94 : 2) // any from 88...98 ?!
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something) => valid values from 91 to 103
// 100 shows the same dialog as 97 on 700D/650D or 99 on EOSM
// 94 shows the same dialog as 91 on 700D/650D
#define GUIMODE_ML_MENU (RECORDING ? 100 : lv ? 94 : 2)
#define NUM_PICSTYLES 10
#define FLASH_MAX_EV 3
......
......@@ -153,8 +153,9 @@
#define DISPLAY_TRAP_FOCUS_MSG_BLANK " "
// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 91 : 2) // any from 88...98 ?!
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something) => valid values from 88 to 98
// 97 and 91 show the same dialog as on 700D
#define GUIMODE_ML_MENU (RECORDING ? 97 : lv ? 91 : 2)
#define NUM_PICSTYLES 10
#define FLASH_MAX_EV 3
......
......@@ -153,8 +153,10 @@
#define DISPLAY_TRAP_FOCUS_MSG_BLANK " "
// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 91 : 2) // any from 88...98 ?!
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something) => valid values from 88 to 98
// 97 works both in standby and while recording H.264, allows scrollwheel events, only shows a "return" touch button
// 91 works better in standby, as 97 may display the exposure compensation bar over ML menu
#define GUIMODE_ML_MENU (RECORDING ? 97 : lv ? 91 : 2)
#define NUM_PICSTYLES 10
#define FLASH_MAX_EV 3
......
......@@ -101,10 +101,10 @@
#define HOTPLUG_VIDEO_OUT_STATUS_ADDR 0x3DEC8
// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
//~ #define GUIMODE_ML_MENU (recording ? 0 : lv ? 90 : 2) // any from 90...102 ?!
#define GUIMODE_ML_MENU ( RECORDING_H264 ? 99 : 91 ) // any from 90...102 ?!
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something) => valid values from 90 to 102
// 99 shows the same dialog as 97 on 700D/650D
// 93 shows the same dialog as 91 on 700D/650D
#define GUIMODE_ML_MENU ( RECORDING_H264 ? 99 : 93 )
// for displaying TRAP FOCUS msg outside LV
#define DISPLAY_TRAP_FOCUS_POS_X 50
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment