From e6615c1c439a8d68768f97cb962849745ae32d4f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 6 Jun 2015 18:23:05 +0200 Subject: [PATCH] Update to latest DPF --- dpf | 2 +- plugins/ProM/DistrhoUIProM.cpp | 60 +++++++++++++++++----------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dpf b/dpf index 67b302d..a02cdf7 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 67b302dc3b038fafa20fbe6fa6bdddfbaf9d0b02 +Subproject commit a02cdf7ace1bb95d6b6e5ad34a5363f3c5ffd931 diff --git a/plugins/ProM/DistrhoUIProM.cpp b/plugins/ProM/DistrhoUIProM.cpp index b08ec47..218cb4d 100644 --- a/plugins/ProM/DistrhoUIProM.cpp +++ b/plugins/ProM/DistrhoUIProM.cpp @@ -174,13 +174,13 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev) { switch (ev.key) { - case DGL::CHAR_BACKSPACE: + case DGL::kCharBackspace: pmKey = PROJECTM_K_BACKSPACE; break; - case DGL::CHAR_ESCAPE: + case DGL::kCharEscape: pmKey = PROJECTM_K_ESCAPE; break; - case DGL::CHAR_DELETE: + case DGL::kCharDelete: pmKey = PROJECTM_K_DELETE; break; } @@ -189,7 +189,7 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev) if (pmKey == PROJECTM_K_NONE) return false; - if (ev.mod & DGL::MODIFIER_CTRL) + if (ev.mod & DGL::kModifierControl) pmMod = PROJECTM_KMOD_LCTRL; fPM->key_handler(ev.press ? PROJECTM_KEYUP : PROJECTM_KEYDOWN, pmKey, pmMod); @@ -207,84 +207,84 @@ bool DistrhoUIProM::onSpecial(const SpecialEvent& ev) switch (ev.key) { - case DGL::KEY_F1: + case DGL::kKeyF1: pmKey = PROJECTM_K_F1; break; - case DGL::KEY_F2: + case DGL::kKeyF2: pmKey = PROJECTM_K_F2; break; - case DGL::KEY_F3: + case DGL::kKeyF3: pmKey = PROJECTM_K_F3; break; - case DGL::KEY_F4: + case DGL::kKeyF4: pmKey = PROJECTM_K_F4; break; - case DGL::KEY_F5: + case DGL::kKeyF5: pmKey = PROJECTM_K_F5; break; - case DGL::KEY_F6: + case DGL::kKeyF6: pmKey = PROJECTM_K_F6; break; - case DGL::KEY_F7: + case DGL::kKeyF7: pmKey = PROJECTM_K_F7; break; - case DGL::KEY_F8: + case DGL::kKeyF8: pmKey = PROJECTM_K_F8; break; - case DGL::KEY_F9: + case DGL::kKeyF9: pmKey = PROJECTM_K_F9; break; - case DGL::KEY_F10: + case DGL::kKeyF10: pmKey = PROJECTM_K_F10; break; - case DGL::KEY_F11: + case DGL::kKeyF11: pmKey = PROJECTM_K_F11; break; - case DGL::KEY_F12: + case DGL::kKeyF12: pmKey = PROJECTM_K_F12; break; - case DGL::KEY_LEFT: + case DGL::kKeyLeft: pmKey = PROJECTM_K_LEFT; break; - case DGL::KEY_UP: + case DGL::kKeyUp: pmKey = PROJECTM_K_UP; break; - case DGL::KEY_RIGHT: + case DGL::kKeyRight: pmKey = PROJECTM_K_RIGHT; break; - case DGL::KEY_DOWN: + case DGL::kKeyDown: pmKey = PROJECTM_K_DOWN; break; - case DGL::KEY_PAGE_UP: + case DGL::kKeyPageUp: pmKey = PROJECTM_K_PAGEUP; break; - case DGL::KEY_PAGE_DOWN: + case DGL::kKeyPageDown: pmKey = PROJECTM_K_PAGEDOWN; break; - case DGL::KEY_HOME: + case DGL::kKeyHome: pmKey = PROJECTM_K_HOME; break; - case DGL::KEY_END: + case DGL::kKeyEnd: pmKey = PROJECTM_K_END; break; - case DGL::KEY_INSERT: + case DGL::kKeyInsert: pmKey = PROJECTM_K_INSERT; break; - case DGL::KEY_SHIFT: + case DGL::kKeyShift: pmKey = PROJECTM_K_LSHIFT; break; - case DGL::KEY_CTRL: + case DGL::kKeyControl: pmKey = PROJECTM_K_LCTRL; break; - case DGL::KEY_ALT: - case DGL::KEY_SUPER: + case DGL::kKeyAlt: + case DGL::kKeySuper: break; } if (pmKey == PROJECTM_K_NONE) return false; - if (ev.mod & DGL::MODIFIER_CTRL) + if (ev.mod & DGL::kModifierControl) pmMod = PROJECTM_KMOD_LCTRL; fPM->key_handler(ev.press ? PROJECTM_KEYUP : PROJECTM_KEYDOWN, pmKey, pmMod);