Removes trailing spaces. Removes tabs.

[vlc] / activex / plugin.h

diff --git a/activex/plugin.h b/activex/plugin.h
index 94a4abe64d3b66dacf61b8b5217e054cc6de5b7b..ca78eb32fb148f9631a0ef4654f1c8f2ec1893de 100644 (file)
--- 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 const GUID CLSID_VLCPlugin;
+extern const GUID CLSID_VLCPlugin2;
+extern const GUID LIBID_AXVLC;
+extern const GUID DIID_DVLCEvents;
 
 class VLCPluginClass : public IClassFactory
 {
@@ -51,8 +51,7 @@ public:
 
     REFCLSID getClassID(void) { return (REFCLSID)_classid; };
 
-    LPCSTR getInPlaceWndClassName(void) const { return TEXT("VLC Plugin In-Place"); };
-    LPCSTR getVideoWndClassName(void) const { return TEXT("VLC Plugin Video"); };
+    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; };
@@ -67,7 +66,6 @@ private:
     HINSTANCE   _hinstance;
     CLSID       _classid;
     ATOM        _inplace_wndclass_atom;
-    ATOM        _video_wndclass_atom;
     LPPICTURE   _inplace_picture;
 };
 
@@ -106,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);
@@ -116,13 +114,31 @@ 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); };
 
+    inline void setStartTime(int time)
+    {
+        _i_time = time;
+        setDirty(TRUE);
+    };
+    inline int getStartTime(void) { return _i_time; };
+
     void setTime(int time);
     int  getTime(void) { return _i_time; };
 
+    void setBaseURL(BSTR url)
+    {
+        SysFreeString(_bstr_baseurl);
+        _bstr_baseurl = SysAllocStringLen(url, SysStringLen(url));
+        setDirty(TRUE);
+    };
+    const BSTR getBaseURL(void) { return _bstr_baseurl; };
+
     // control size in HIMETRIC
     inline void setExtent(const SIZEL& extent)
     {
@@ -131,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)
@@ -149,7 +165,7 @@ public:
             _p_pict->AddRef();
         return _p_pict;
     };
-    
+
     BOOL hasFocus(void);
     void setFocus(BOOL fFocus);
 
@@ -172,9 +188,10 @@ 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; }; 
+    RECT getPosRect(void) { return _posRect; };
     inline HWND getInPlaceWindow(void) const { return _inplacewnd; };
     BOOL isInPlaceActive(void);
 
@@ -225,11 +242,10 @@ private:
     class VLCControl2 *vlcControl2;
     class VLCViewObject *vlcViewObject;
     class VLCDataObject *vlcDataObject;
+    class VLCSupportErrorInfo *vlcSupportErrorInfo;
 
-    // in place activated window (Clipping window)
+    // in place activated window (Plugin window)
     HWND _inplacewnd;
-    // video window (Drawing window)
-    HWND _videownd;
 
     VLCPluginClass* _p_class;
     ULONG _i_ref;
@@ -238,8 +254,10 @@ private:
     UINT _i_codepage;
     BOOL _b_usermode;
     RECT _posRect;
+    LPPICTURE _p_pict;
 
     // persistable properties
+    BSTR _bstr_baseurl;
     BSTR _bstr_mrl;
     BOOL _b_autoplay;
     BOOL _b_autoloop;
@@ -248,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
-