[vlc-commits] Qt: fix EventId collisions

Jean-Baptiste Kempf git at videolan.org
Mon Nov 23 22:28:43 CET 2015


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Nov 23 22:27:04 2015 +0100| [2530f6a54b07995eea0aaaaec6abcd76fb564b79] | committer: Jean-Baptiste Kempf

Qt: fix EventId collisions

Ref #14885 #14166 #14162 #14442

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2530f6a54b07995eea0aaaaec6abcd76fb564b79
---

 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 f34bd33..5350b1e 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