[vlc-commits] Qt: fix EventId collisions
Jean-Baptiste Kempf
git at videolan.org
Mon Nov 23 22:30:24 CET 2015
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Nov 23 22:27:04 2015 +0100| [110d734f81180a2749fe0730e796f44067f4017e] | committer: Jean-Baptiste Kempf
Qt: fix EventId collisions
Ref #14885 #14166 #14162 #14442
(cherry picked from commit 2530f6a54b07995eea0aaaaec6abcd76fb564b79)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=110d734f81180a2749fe0730e796f44067f4017e
---
modules/gui/qt4/input_manager.hpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index b69b6f9..b696884 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -56,8 +56,8 @@ public:
ItemEsChanged,
ItemTeletextChanged,
InterfaceVoutUpdate,
- StatisticsUpdate, /*10*/
- InterfaceAoutUpdate,
+ StatisticsUpdate,
+ InterfaceAoutUpdate, /* 10 */
MetaChanged,
NameChanged,
InfoChanged,
@@ -67,11 +67,11 @@ public:
RecordingEvent,
ProgramChanged,
RandomChanged,
- LoopOrRepeatChanged,
+ LoopOrRepeatChanged, /* 20 */
EPGEvent,
/* SignalChanged, */
- FullscreenControlToggle = QEvent::User + IMEventTypeOffset + 20,
+ FullscreenControlToggle = QEvent::User + IMEventTypeOffset + 50,
FullscreenControlShow,
FullscreenControlHide,
FullscreenControlPlanHide,
More information about the vlc-commits
mailing list