]> git.sesse.net Git - casparcg/commitdiff
Just ignore WM_TIMER messages we are sure should be ignored.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 25 Jan 2012 20:37:55 +0000 (20:37 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 25 Jan 2012 20:37:55 +0000 (20:37 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@2166 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/flash/producer/flash_producer.cpp

index 3b8c5e39edeec07349c79d7f5d5a2885d0602a6c..45506340f11358e575645ee1eeb4d4b0419fbde2 100644 (file)
@@ -277,17 +277,15 @@ public:
                        frame->commit();\r
                        head_ = frame;\r
                }               \r
-\r
-               // DO NOT REMOVE THE MESSAGE DISPATCH LOOP. Without this some stuff doesn't work!\r
-       \r
+                                       \r
                MSG msg;\r
-               while(PeekMessage(&msg, NULL, NULL, NULL, PM_REMOVE)) \r
+               while(PeekMessage(&msg, NULL, NULL, NULL, PM_REMOVE)) // DO NOT REMOVE THE MESSAGE DISPATCH LOOP. Without this some stuff doesn't work!  \r
                {\r
-                       if(msg.message != WM_TIMER)\r
-                       {\r
-                               TranslateMessage(&msg);\r
-                               DispatchMessage(&msg);\r
-                       }\r
+                       if(msg.message == WM_TIMER && msg.wParam == 3 && msg.lParam == 0) // We tick this inside FlashAxContainer\r
+                               continue;\r
+                       \r
+                       TranslateMessage(&msg);\r
+                       DispatchMessage(&msg);                  \r
                }\r
                                                                                \r
                graph_->set_value("frame-time", static_cast<float>(frame_timer_.elapsed()/frame_time)*0.5f);\r