* ctrl_*.cpp : mouse scrolling behavior change

[vlc] / activex / connectioncontainer.h

diff --git a/activex/connectioncontainer.h b/activex/connectioncontainer.h
index 00ea1a9e3b07136fef3c1539860c0dab54b9bc2b..3713e9ee77aea0ed8b4869ae5bbdfea980547985 100644 (file)
--- a/activex/connectioncontainer.h
+++ b/activex/connectioncontainer.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * connectioncontainer.h: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2005 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *
@@ -25,8 +25,7 @@
 
 #include <ocidl.h>
 #include <vector>
-
-using namespace std;
+#include <queue>
 
 class VLCConnectionPoint : public IConnectionPoint
 {
@@ -68,11 +67,23 @@ private:
 
     REFIID _iid;
     IConnectionPointContainer *_p_cpc;
-    vector<CONNECTDATA> _connections;
+    std::vector<CONNECTDATA> _connections;
 };
 
 //////////////////////////////////////////////////////////////////////////
 
+class VLCDispatchEvent {
+
+public:
+    VLCDispatchEvent(DISPID dispId, DISPPARAMS dispParams) :
+        _dispId(dispId), _dispParams(dispParams) {};
+    VLCDispatchEvent(const VLCDispatchEvent&);
+    ~VLCDispatchEvent();
+
+    DISPID      _dispId;
+    DISPPARAMS  _dispParams;
+};
+
 class VLCConnectionPointContainer : public IConnectionPointContainer
 {
 
@@ -91,25 +102,28 @@ public:
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
         }
-        return _p_instance->QueryInterface(riid, ppv);
+        return _p_instance->pUnkOuter->QueryInterface(riid, ppv);
     };
 
-    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->AddRef(); };
-    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->Release(); };
+    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->pUnkOuter->AddRef(); };
+    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->pUnkOuter->Release(); };
 
     // IConnectionPointContainer methods
     STDMETHODIMP EnumConnectionPoints(LPENUMCONNECTIONPOINTS *);
     STDMETHODIMP FindConnectionPoint(REFIID, LPCONNECTIONPOINT *);
 
+    void freezeEvents(BOOL);
     void fireEvent(DISPID, DISPPARAMS*);
     void firePropChangedEvent(DISPID dispId);
 
 private:
 
     VLCPlugin *_p_instance;
+    BOOL _b_freeze;
     VLCConnectionPoint *_p_events;
     VLCConnectionPoint *_p_props;
-    vector<LPCONNECTIONPOINT> _v_cps;
+    std::vector<LPCONNECTIONPOINT> _v_cps;
+    std::queue<class VLCDispatchEvent *> _q_events;
 };
 
 #endif