Changeset 181 for smplayer/trunk/src/myapplication.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/myapplication.cpp (modified) (3 diffs)

smplayer/trunk/src/myapplication.cpp

@@ -18 +18 @@
 
 #include "myapplication.h"
+
+#ifdef SINGLE_INSTANCE
+MyApplication::MyApplication ( const QString & appId, int & argc, char ** argv ) 
+        : QtSingleApplication(appId, argc, argv)
+{
+#if defined(USE_WINEVENTFILTER) && QT_VERSION >= 0x050000
+        installNativeEventFilter(this);
+#endif
+};
+
+#else
+
+MyApplication::MyApplication ( const QString & appId, int & argc, char ** argv ) 
+        : QApplication(argc, argv)
+{
+#if defined(USE_WINEVENTFILTER) && QT_VERSION >= 0x050000
+        installNativeEventFilter(this);
+#endif
+};
+
+#endif
+        
+#if defined(USE_WINEVENTFILTER) && QT_VERSION >= 0x050000
+bool MyApplication::nativeEventFilter(const QByteArray &eventType, void *message, long *result) {
+        //qDebug() << "MyApplication::nativeEventFilter:" <<eventType;
+        
+        if (eventType == "windows_generic_MSG" || eventType == "windows_dispatcher_MSG") {
+                MSG * m = static_cast<MSG *>(message);
+                return winEventFilter(m, result);
+        }
+        
+        return false;
+}
+#endif
 
 #ifdef USE_WINEVENTFILTER
@@ -122 +156 @@
                 
                 if (eat_key) { 
-                        qDebug("MyApplication::winEventFilter: ignoring key %X", msg->wParam);
+                        qDebug() << "MyApplication::winEventFilter: ignoring key" << msg->wParam;
                         last_appcommand = 0; 
-                        *result = true; 
+                        //*result = true; 
                         return true; 
                 }
@@ -165 +199 @@
                                 QWidget * w = QApplication::focusWidget();
                                 if (w) QCoreApplication::sendEvent(w, &event);
-                                *result = true;
+                                //*result = true;
                                 return true;
                         }