X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Fplugin.h;h=c2612e4879d7da3e9928a4147d2926d034e5f5be;hb=cc008d9defb762e5c0dd40e4501d3b7c299354fc;hp=864fac43f7183ce21c3fff39fa2ace86bd7a1339;hpb=fc9b8e56966b81ebe9852b1e8a1cd4b4842135ee;p=vlc

diff --git a/activex/plugin.h b/activex/plugin.h
index 864fac43f7..c2612e4879 100644
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -28,10 +28,10 @@
 
 #include <vlc/libvlc.h>
 
-extern const GUID CLSID_VLCPlugin; 
-extern const GUID CLSID_VLCPlugin2; 
-extern const GUID LIBID_AXVLC; 
-extern const GUID DIID_DVLCEvents; 
+extern "C" const GUID CLSID_VLCPlugin;
+extern "C" const GUID CLSID_VLCPlugin2;
+extern "C" const GUID LIBID_AXVLC;
+extern "C" const GUID DIID_DVLCEvents;
 
 class VLCPluginClass : public IClassFactory
 {
@@ -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; };
@@ -104,7 +104,7 @@ public:
     };
     inline BOOL getAutoPlay(void) { return _b_autoplay; };
 
-    inline void setAutoLoop(BOOL autoloop) 
+    inline void setAutoLoop(BOOL autoloop)
     {
         _b_autoloop = autoloop;
         setDirty(TRUE);
@@ -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); };
@@ -144,7 +147,7 @@ public:
     };
     const SIZEL& getExtent(void) { return _extent; };
 
-    // transient properties 
+    // transient properties
     inline void setMute(BOOL mute) { _b_mute = mute; };
 
     inline void setPicture(LPPICTURE pict)
@@ -188,7 +191,7 @@ public:
     void setErrorInfo(REFIID riid, const char *description);
 
     // control geometry within container
-    RECT getPosRect(void) { return _posRect; }; 
+    RECT getPosRect(void) { return _posRect; };
     inline HWND getInPlaceWindow(void) const { return _inplacewnd; };
     BOOL isInPlaceActive(void);
 
@@ -251,6 +254,7 @@ private:
     UINT _i_codepage;
     BOOL _b_usermode;
     RECT _posRect;
+    LPPICTURE _p_pict;
 
     // persistable properties
     BSTR _bstr_baseurl;
@@ -262,7 +266,7 @@ private:
     int  _i_volume;
     int  _i_time;
     SIZEL _extent;
-    LPPICTURE _p_pict;
+    OLE_COLOR _i_backcolor;
     // indicates whether properties needs persisting
     BOOL _b_dirty;
 };