X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Fplugin.h;h=9d09a4fa0cecdfd11b11f3b66f4a74aa58940ca0;hb=128338ce014d8a40645a9cb4b6f4d0f545b7f3b3;hp=3689831b59ecfbc5060f58a97865b7a078de6ad3;hpb=5e45f57e88eaff51a875b3dec9791b7496d4484f;p=vlc

diff --git a/activex/plugin.h b/activex/plugin.h
index 3689831b59..9d09a4fa0c 100644
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -51,7 +51,7 @@ public:
 
     REFCLSID getClassID(void) { return (REFCLSID)_classid; };
 
-    LPCSTR getInPlaceWndClassName(void) const { return TEXT("VLC Plugin In-Place"); };
+    LPCTSTR getInPlaceWndClassName(void) const { return TEXT("VLC Plugin In-Place"); };
     HINSTANCE getHInstance(void) const { return _hinstance; };
     LPPICTURE getInPlacePict(void) const
         { if( NULL != _inplace_picture) _inplace_picture->AddRef(); return _inplace_picture; };
@@ -114,6 +114,9 @@ public:
     void setVolume(int volume);
     int getVolume(void) { return _i_volume; };
 
+    void setBackColor(OLE_COLOR backcolor);
+    OLE_COLOR getBackColor(void) { return _i_backcolor; };
+
     void setVisible(BOOL fVisible);
     BOOL getVisible(void) { return _b_visible; };
     BOOL isVisible(void) { return _b_visible || (! _b_usermode); };
@@ -162,7 +165,7 @@ public:
             _p_pict->AddRef();
         return _p_pict;
     };
-    
+
     BOOL hasFocus(void);
     void setFocus(BOOL fFocus);
 
@@ -185,6 +188,7 @@ public:
     inline BOOL isRunning(void) { return NULL != _p_libvlc; };
     HRESULT getVLCObject(int *i_vlc);
     HRESULT getVLC(libvlc_instance_t** p_vlc);
+    void setErrorInfo(REFIID riid, const char *description);
 
     // control geometry within container
     RECT getPosRect(void) { return _posRect; }; 
@@ -238,6 +242,7 @@ private:
     class VLCControl2 *vlcControl2;
     class VLCViewObject *vlcViewObject;
     class VLCDataObject *vlcDataObject;
+    class VLCSupportErrorInfo *vlcSupportErrorInfo;
 
     // in place activated window (Plugin window)
     HWND _inplacewnd;
@@ -249,6 +254,7 @@ private:
     UINT _i_codepage;
     BOOL _b_usermode;
     RECT _posRect;
+    LPPICTURE _p_pict;
 
     // persistable properties
     BSTR _bstr_baseurl;
@@ -260,10 +266,9 @@ private:
     int  _i_volume;
     int  _i_time;
     SIZEL _extent;
-    LPPICTURE _p_pict;
+    OLE_COLOR _i_backcolor;
     // indicates whether properties needs persisting
     BOOL _b_dirty;
 };
 
 #endif
-