Commit e5ff4e7a authored by Jean-Paul Saman's avatar Jean-Paul Saman

Move Toolbar to the IVLCControl2 interface object, where it should have been all along.

parent a2ccb9b4
...@@ -134,15 +134,6 @@ library AXVLC ...@@ -134,15 +134,6 @@ library AXVLC
** for compatibility with some scripting language (JScript) ** for compatibility with some scripting language (JScript)
*/ */
/*
* caution: vlcobject.toolbar:bool does not yet exists in Firefox
* plugin. Official usage is through "toolbar" property for now,
* which is compatibile with Firefox.
*/
[id(DISPID_Toolbar), propget, helpstring("Returns/sets visibility of the toolbar")]
HRESULT Toolbar([out, retval] VARIANT_BOOL* visible);
[id(DISPID_Toolbar), propput, helpstring("Returns/sets visibility of the toolbar")]
HRESULT Toolbar([in] VARIANT_BOOL visible);
HRESULT addTarget([in] BSTR uri, [in] VARIANT options, [in] enum VLCPlaylistMode mode, [in] int position); HRESULT addTarget([in] BSTR uri, [in] VARIANT options, [in] enum VLCPlaylistMode mode, [in] int position);
[propget, helpstring("Returns index of current item in playlist.")] [propget, helpstring("Returns index of current item in playlist.")]
HRESULT PlaylistIndex([out, retval] int* index); HRESULT PlaylistIndex([out, retval] int* index);
...@@ -420,6 +411,7 @@ library AXVLC ...@@ -420,6 +411,7 @@ library AXVLC
{ {
[propget, helpstring("Returns/sets the fullscreen state.")] [propget, helpstring("Returns/sets the fullscreen state.")]
HRESULT fullscreen([out, retval] VARIANT_BOOL* fullscreen); HRESULT fullscreen([out, retval] VARIANT_BOOL* fullscreen);
[propput, helpstring("Returns/sets the fullscreen state.")] [propput, helpstring("Returns/sets the fullscreen state.")]
HRESULT fullscreen([in] VARIANT_BOOL fullscreen); HRESULT fullscreen([in] VARIANT_BOOL fullscreen);
...@@ -511,6 +503,16 @@ library AXVLC ...@@ -511,6 +503,16 @@ library AXVLC
[id(DISPID_BackColor), propput, helpstring("Returns/sets background color.")] [id(DISPID_BackColor), propput, helpstring("Returns/sets background color.")]
HRESULT BackColor([in] OLE_COLOR backcolor); HRESULT BackColor([in] OLE_COLOR backcolor);
/*
* caution: vlcobject.toolbar:bool does not yet exists in Firefox
* plugin. Official usage is through "toolbar" property for now,
* which is compatibile with Firefox.
*/
[id(DISPID_Toolbar), propget, helpstring("Returns/sets visibility of the toolbar")]
HRESULT Toolbar([out, retval] VARIANT_BOOL* visible);
[id(DISPID_Toolbar), propput, helpstring("Returns/sets visibility of the toolbar")]
HRESULT Toolbar([in] VARIANT_BOOL visible);
[propget, helpstring("Returns the audio object.")] [propget, helpstring("Returns the audio object.")]
HRESULT audio([out, retval] IVLCAudio** obj); HRESULT audio([out, retval] IVLCAudio** obj);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment