Commit e79db6b8 authored by JP Dinger's avatar JP Dinger Committed by Jean-Baptiste Kempf

Update activex plugin and test page for new logo interface.

parent 1df0dd79
......@@ -2,6 +2,7 @@
* axvlc.idl: ActiveX control for VLC
*****************************************************************************
* Copyright (C) 2006 the VideoLAN team
* Copyright (C) 2010 M2X BV
*
* Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
* Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
......@@ -21,8 +22,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
//comments terminated by [t] are by tonsofpcs, regarding the string review. April 02, 2006. [t]
//Possibly change all instances of "the current playlist" to "the playlist" and "current playlist" to "the playlist" [t]
// comments terminated by [t] are by tonsofpcs, regarding the string
// review. April 02, 2006. [t]
// Possibly change all instances of "the current playlist" to "the
// playlist" and "current playlist" to "the playlist" [t]
import "ocidl.idl";
......@@ -129,13 +132,13 @@ library AXVLC
HRESULT setVariable([in] BSTR name, [in] VARIANT value);
[helpstring("Returns the value of a VLC variable.")]
HRESULT getVariable([in] BSTR name, [out, retval] VARIANT *value);
[helpstring("Add an item to the playlist.")]
/*
** use VARIANT rather than a SAFEARRAY as argument type
** for compatibility with some scripting language (JScript)
*/
[helpstring("Add an item to the playlist.")]
HRESULT addTarget([in] BSTR uri, [in] VARIANT options, [in] enum VLCPlaylistMode mode, [in] int position);
[propget, helpstring("Returns index of current item in playlist.")]
HRESULT PlaylistIndex([out, retval] int* index);
......@@ -463,6 +466,54 @@ library AXVLC
HRESULT y ([in] long val);
};
[
odl,
uuid(8a4a20c2-93f3-44e8-8644-beb2e3487e84),
helpstring("VLC Logo Filter"),
dual,
oleautomation
]
interface IVLCLogo : IDispatch
{
[helpstring("Enable the logo filter.")]
HRESULT enable();
[helpstring("Disable the logo filter.")]
HRESULT disable();
[helpstring("specify input file[[,delay],alpha].")]
HRESULT file([in] BSTR fname);
[propget, helpstring("")]
HRESULT delay([out, retval] long* val);
[propput, helpstring("Set delay-to-next-picture in miliseconds.")]
HRESULT delay([in] long val);
[propget, helpstring("")]
HRESULT repeat([out, retval] long* val);
[propput, helpstring("Repeat: -1 continuous (default), 0 no repeat, ....")]
HRESULT repeat([in] long val);
[propget, helpstring("Returns the `global' alpha value.")]
HRESULT opacity([out, retval] long* val);
[propput, helpstring("Alpha value: 0 opaque to 255 fully transparent")]
HRESULT opacity([in] long val);
[propget, helpstring("Retrieve picture position.")]
HRESULT position([out, retval] BSTR* val);
[propput, helpstring("Picture positioning relative to: center, left, right, top, bottom, top-left, top-right, bottom-left, bottom-right.")]
HRESULT position([in] BSTR val);
[propget, helpstring("Picture x offset.")]
HRESULT x([out, retval] long* val);
[propput, helpstring("Picture x offset.")]
HRESULT x([in] long val);
[propget, helpstring("Picture y offset.")]
HRESULT y([out, retval] long* val);
[propput, helpstring("Picture y offset.")]
HRESULT y([in] long val);
};
[
odl,
uuid(0AAEDF0B-D333-4B27-A0C6-BBF31413A42E),
......@@ -520,6 +571,9 @@ library AXVLC
[propget, helpstring("Returns the marquee object.")]
HRESULT marquee([out, retval] IVLCMarquee** obj);
[propget, helpstring("Returns the logo object.")]
HRESULT logo([out, retval] IVLCLogo** obj);
};
[
......
/*** Autogenerated by WIDL 1.0 from axvlc.idl - Do not edit ***/
/*** Autogenerated by WIDL 1.1.23 from axvlc.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
......@@ -22,6 +22,7 @@ DEFINE_GUID(IID_IVLCPlaylistItems, 0xfd37fe32, 0x82bc, 0x4a25, 0xb0,0x56, 0x31,0
DEFINE_GUID(IID_IVLCPlaylist, 0x54613049, 0x40bf, 0x4035, 0x9e,0x70, 0x0a,0x93,0x12,0xc0,0x18,0x8d);
DEFINE_GUID(IID_IVLCSubtitle, 0x465e787a, 0x0556, 0x452f, 0x94,0x77, 0x95,0x4e,0x4a,0x94,0x00,0x03);
DEFINE_GUID(IID_IVLCMarquee, 0x8d076ad6, 0x9b6f, 0x4150, 0xa0,0xfd, 0x5d,0x7e,0x8c,0x8c,0xb0,0x2c);
DEFINE_GUID(IID_IVLCLogo, 0x8a4a20c2, 0x93f3, 0x44e8, 0x86,0x44, 0xbe,0xb2,0xe3,0x48,0x7e,0x84);
DEFINE_GUID(IID_IVLCVideo, 0x0aaedf0b, 0xd333, 0x4b27, 0xa0,0xc6, 0xbb,0xf3,0x14,0x13,0xa4,0x2e);
DEFINE_GUID(IID_IVLCControl2, 0x2d719729, 0x5333, 0x406c, 0xbf,0x12, 0x8d,0xe7,0x87,0xfd,0x65,0xe3);
DEFINE_GUID(CLSID_VLCPlugin, 0xe23fe9c6, 0x778e, 0x49d4, 0xb5,0x37, 0x38,0xfc,0xde,0x48,0x87,0xd8);
......
/*** Autogenerated by WIDL 1.0 from axvlc.idl - Do not edit ***/
/*** Autogenerated by WIDL 1.1.23 from axvlc.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
#ifndef __WIDL_AXVLC_IDL_H
#define __WIDL_AXVLC_IDL_H
#ifdef __cplusplus
extern "C" {
#endif
/* Headers for imported files */
#include <ocidl.h>
/* Forward declarations */
#ifndef __IVLCControl_FWD_DEFINED__
#define __IVLCControl_FWD_DEFINED__
typedef interface IVLCControl IVLCControl;
#endif
#ifndef __DVLCEvents_FWD_DEFINED__
#define __DVLCEvents_FWD_DEFINED__
typedef interface DVLCEvents DVLCEvents;
#endif
#ifndef __IVLCAudio_FWD_DEFINED__
#define __IVLCAudio_FWD_DEFINED__
typedef interface IVLCAudio IVLCAudio;
#endif
#ifndef __IVLCInput_FWD_DEFINED__
#define __IVLCInput_FWD_DEFINED__
typedef interface IVLCInput IVLCInput;
#endif
#ifndef __IVLCMessage_FWD_DEFINED__
#define __IVLCMessage_FWD_DEFINED__
typedef interface IVLCMessage IVLCMessage;
#endif
#ifndef __IVLCMessageIterator_FWD_DEFINED__
#define __IVLCMessageIterator_FWD_DEFINED__
typedef interface IVLCMessageIterator IVLCMessageIterator;
#endif
#ifndef __IVLCMessages_FWD_DEFINED__
#define __IVLCMessages_FWD_DEFINED__
typedef interface IVLCMessages IVLCMessages;
#endif
#ifndef __IVLCLog_FWD_DEFINED__
#define __IVLCLog_FWD_DEFINED__
typedef interface IVLCLog IVLCLog;
#endif
#ifndef __IVLCPlaylistItems_FWD_DEFINED__
#define __IVLCPlaylistItems_FWD_DEFINED__
typedef interface IVLCPlaylistItems IVLCPlaylistItems;
#endif
#ifndef __IVLCPlaylist_FWD_DEFINED__
#define __IVLCPlaylist_FWD_DEFINED__
typedef interface IVLCPlaylist IVLCPlaylist;
#endif
#ifndef __IVLCSubtitle_FWD_DEFINED__
#define __IVLCSubtitle_FWD_DEFINED__
typedef interface IVLCSubtitle IVLCSubtitle;
#endif
#ifndef __IVLCMarquee_FWD_DEFINED__
#define __IVLCMarquee_FWD_DEFINED__
typedef interface IVLCMarquee IVLCMarquee;
#endif
#ifndef __IVLCLogo_FWD_DEFINED__
#define __IVLCLogo_FWD_DEFINED__
typedef interface IVLCLogo IVLCLogo;
#endif
#ifndef __IVLCVideo_FWD_DEFINED__
#define __IVLCVideo_FWD_DEFINED__
typedef interface IVLCVideo IVLCVideo;
#endif
#ifndef __IVLCControl2_FWD_DEFINED__
#define __IVLCControl2_FWD_DEFINED__
typedef interface IVLCControl2 IVLCControl2;
#endif
#ifndef __VLCPlugin_FWD_DEFINED__
#define __VLCPlugin_FWD_DEFINED__
typedef struct VLCPlugin VLCPlugin;
#endif /* defined __VLCPlugin_FWD_DEFINED__ */
#ifndef __VLCPlugin2_FWD_DEFINED__
#define __VLCPlugin2_FWD_DEFINED__
typedef struct VLCPlugin2 VLCPlugin2;
#endif /* defined __VLCPlugin2_FWD_DEFINED__ */
DEFINE_GUID(LIBID_AXVLC, 0xdf2bbe39, 0x40a8, 0x433b, 0xa2,0x79, 0x07,0x3f,0x48,0xda,0x94,0xb6);
#ifndef __IVLCControl_FWD_DEFINED__
......@@ -821,32 +914,32 @@ interface IVLCAudio : public IDispatch
VARIANT_BOOL muted) = 0;
virtual HRESULT STDMETHODCALLTYPE get_volume(
long *volume) = 0;
LONG *volume) = 0;
virtual HRESULT STDMETHODCALLTYPE put_volume(
long volume) = 0;
LONG volume) = 0;
virtual HRESULT STDMETHODCALLTYPE toggleMute(
) = 0;
virtual HRESULT STDMETHODCALLTYPE get_track(
long *track) = 0;
LONG *track) = 0;
virtual HRESULT STDMETHODCALLTYPE put_track(
long track) = 0;
LONG track) = 0;
virtual HRESULT STDMETHODCALLTYPE get_count(
long *trackNumber) = 0;
LONG *trackNumber) = 0;
virtual HRESULT STDMETHODCALLTYPE description(
long trackID,
LONG trackID,
BSTR *name) = 0;
virtual HRESULT STDMETHODCALLTYPE get_channel(
long *channel) = 0;
LONG *channel) = 0;
virtual HRESULT STDMETHODCALLTYPE put_channel(
long channel) = 0;
LONG channel) = 0;
};
#else
......@@ -906,39 +999,39 @@ typedef struct IVLCAudioVtbl {
HRESULT (STDMETHODCALLTYPE *get_volume)(
IVLCAudio* This,
long *volume);
LONG *volume);
HRESULT (STDMETHODCALLTYPE *put_volume)(
IVLCAudio* This,
long volume);
LONG volume);
HRESULT (STDMETHODCALLTYPE *toggleMute)(
IVLCAudio* This);
HRESULT (STDMETHODCALLTYPE *get_track)(
IVLCAudio* This,
long *track);
LONG *track);
HRESULT (STDMETHODCALLTYPE *put_track)(
IVLCAudio* This,
long track);
LONG track);
HRESULT (STDMETHODCALLTYPE *get_count)(
IVLCAudio* This,
long *trackNumber);
LONG *trackNumber);
HRESULT (STDMETHODCALLTYPE *description)(
IVLCAudio* This,
long trackID,
LONG trackID,
BSTR *name);
HRESULT (STDMETHODCALLTYPE *get_channel)(
IVLCAudio* This,
long *channel);
LONG *channel);
HRESULT (STDMETHODCALLTYPE *put_channel)(
IVLCAudio* This,
long channel);
LONG channel);
END_INTERFACE
} IVLCAudioVtbl;
......@@ -990,7 +1083,7 @@ void __RPC_STUB IVLCAudio_put_mute_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_get_volume_Proxy(
IVLCAudio* This,
long *volume);
LONG *volume);
void __RPC_STUB IVLCAudio_get_volume_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -998,7 +1091,7 @@ void __RPC_STUB IVLCAudio_get_volume_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_put_volume_Proxy(
IVLCAudio* This,
long volume);
LONG volume);
void __RPC_STUB IVLCAudio_put_volume_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1013,7 +1106,7 @@ void __RPC_STUB IVLCAudio_toggleMute_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_get_track_Proxy(
IVLCAudio* This,
long *track);
LONG *track);
void __RPC_STUB IVLCAudio_get_track_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1021,7 +1114,7 @@ void __RPC_STUB IVLCAudio_get_track_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_put_track_Proxy(
IVLCAudio* This,
long track);
LONG track);
void __RPC_STUB IVLCAudio_put_track_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1029,7 +1122,7 @@ void __RPC_STUB IVLCAudio_put_track_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_get_count_Proxy(
IVLCAudio* This,
long *trackNumber);
LONG *trackNumber);
void __RPC_STUB IVLCAudio_get_count_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1037,7 +1130,7 @@ void __RPC_STUB IVLCAudio_get_count_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_description_Proxy(
IVLCAudio* This,
long trackID,
LONG trackID,
BSTR *name);
void __RPC_STUB IVLCAudio_description_Stub(
IRpcStubBuffer* This,
......@@ -1046,7 +1139,7 @@ void __RPC_STUB IVLCAudio_description_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_get_channel_Proxy(
IVLCAudio* This,
long *channel);
LONG *channel);
void __RPC_STUB IVLCAudio_get_channel_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1054,7 +1147,7 @@ void __RPC_STUB IVLCAudio_get_channel_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCAudio_put_channel_Proxy(
IVLCAudio* This,
long channel);
LONG channel);
void __RPC_STUB IVLCAudio_put_channel_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1089,7 +1182,7 @@ interface IVLCInput : public IDispatch
double time) = 0;
virtual HRESULT STDMETHODCALLTYPE get_state(
long *state) = 0;
LONG *state) = 0;
virtual HRESULT STDMETHODCALLTYPE get_rate(
double *rate) = 0;
......@@ -1173,7 +1266,7 @@ typedef struct IVLCInputVtbl {
HRESULT (STDMETHODCALLTYPE *get_state)(
IVLCInput* This,
long *state);
LONG *state);
HRESULT (STDMETHODCALLTYPE *get_rate)(
IVLCInput* This,
......@@ -1264,7 +1357,7 @@ void __RPC_STUB IVLCInput_put_time_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCInput_get_state_Proxy(
IVLCInput* This,
long *state);
LONG *state);
void __RPC_STUB IVLCInput_get_state_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1319,7 +1412,7 @@ interface IVLCMessage : public IDispatch
VARIANT *message) = 0;
virtual HRESULT STDMETHODCALLTYPE get_severity(
long *level) = 0;
LONG *level) = 0;
virtual HRESULT STDMETHODCALLTYPE get_type(
BSTR *type) = 0;
......@@ -1387,7 +1480,7 @@ typedef struct IVLCMessageVtbl {
HRESULT (STDMETHODCALLTYPE *get_severity)(
IVLCMessage* This,
long *level);
LONG *level);
HRESULT (STDMETHODCALLTYPE *get_type)(
IVLCMessage* This,
......@@ -1442,7 +1535,7 @@ void __RPC_STUB IVLCMessage_get__Value_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCMessage_get_severity_Proxy(
IVLCMessage* This,
long *level);
LONG *level);
void __RPC_STUB IVLCMessage_get_severity_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1614,7 +1707,7 @@ interface IVLCMessages : public IDispatch
) = 0;
virtual HRESULT STDMETHODCALLTYPE get_count(
long *count) = 0;
LONG *count) = 0;
virtual HRESULT STDMETHODCALLTYPE iterator(
IVLCMessageIterator **iter) = 0;
......@@ -1676,7 +1769,7 @@ typedef struct IVLCMessagesVtbl {
HRESULT (STDMETHODCALLTYPE *get_count)(
IVLCMessages* This,
long *count);
LONG *count);
HRESULT (STDMETHODCALLTYPE *iterator)(
IVLCMessages* This,
......@@ -1724,7 +1817,7 @@ void __RPC_STUB IVLCMessages_clear_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCMessages_get_count_Proxy(
IVLCMessages* This,
long *count);
LONG *count);
void __RPC_STUB IVLCMessages_get_count_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1755,10 +1848,10 @@ interface IVLCLog : public IDispatch
IVLCMessages **iter) = 0;
virtual HRESULT STDMETHODCALLTYPE get_verbosity(
long *level) = 0;
LONG *level) = 0;
virtual HRESULT STDMETHODCALLTYPE put_verbosity(
long level) = 0;
LONG level) = 0;
};
#else
......@@ -1814,11 +1907,11 @@ typedef struct IVLCLogVtbl {
HRESULT (STDMETHODCALLTYPE *get_verbosity)(
IVLCLog* This,
long *level);
LONG *level);
HRESULT (STDMETHODCALLTYPE *put_verbosity)(
IVLCLog* This,
long level);
LONG level);
END_INTERFACE
} IVLCLogVtbl;
......@@ -1854,7 +1947,7 @@ void __RPC_STUB IVLCLog_get_messages_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCLog_get_verbosity_Proxy(
IVLCLog* This,
long *level);
LONG *level);
void __RPC_STUB IVLCLog_get_verbosity_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1862,7 +1955,7 @@ void __RPC_STUB IVLCLog_get_verbosity_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCLog_put_verbosity_Proxy(
IVLCLog* This,
long level);
LONG level);
void __RPC_STUB IVLCLog_put_verbosity_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1871,11 +1964,6 @@ void __RPC_STUB IVLCLog_put_verbosity_Stub(
#endif /* __IVLCLog_INTERFACE_DEFINED__ */
#ifndef __IVLCPlaylistItems_FWD_DEFINED__
#define __IVLCPlaylistItems_FWD_DEFINED__
typedef interface IVLCPlaylistItems IVLCPlaylistItems;
#endif
/*****************************************************************************
* IVLCPlaylistItems interface
*/
......@@ -1887,13 +1975,13 @@ DEFINE_GUID(IID_IVLCPlaylistItems, 0xfd37fe32, 0x82bc, 0x4a25, 0xb0,0x56, 0x31,0
interface IVLCPlaylistItems : public IDispatch
{
virtual HRESULT STDMETHODCALLTYPE get_count(
long *count) = 0;
LONG *count) = 0;
virtual HRESULT STDMETHODCALLTYPE clear(
) = 0;
virtual HRESULT STDMETHODCALLTYPE remove(
long itemId) = 0;
LONG itemId) = 0;
};
#else
......@@ -1945,14 +2033,14 @@ typedef struct IVLCPlaylistItemsVtbl {
/*** IVLCPlaylistItems methods ***/
HRESULT (STDMETHODCALLTYPE *get_count)(
IVLCPlaylistItems* This,
long *count);
LONG *count);
HRESULT (STDMETHODCALLTYPE *clear)(
IVLCPlaylistItems* This);
HRESULT (STDMETHODCALLTYPE *remove)(
IVLCPlaylistItems* This,
long itemId);
LONG itemId);
END_INTERFACE
} IVLCPlaylistItemsVtbl;
......@@ -1980,7 +2068,7 @@ interface IVLCPlaylistItems {
HRESULT STDMETHODCALLTYPE IVLCPlaylistItems_get_count_Proxy(
IVLCPlaylistItems* This,
long *count);
LONG *count);
void __RPC_STUB IVLCPlaylistItems_get_count_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -1995,7 +2083,7 @@ void __RPC_STUB IVLCPlaylistItems_clear_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCPlaylistItems_remove_Proxy(
IVLCPlaylistItems* This,
long itemId);
LONG itemId);
void __RPC_STUB IVLCPlaylistItems_remove_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2015,7 +2103,7 @@ DEFINE_GUID(IID_IVLCPlaylist, 0x54613049, 0x40bf, 0x4035, 0x9e,0x70, 0x0a,0x93,0
interface IVLCPlaylist : public IDispatch
{
virtual HRESULT STDMETHODCALLTYPE get_itemCount(
long *count) = 0;
LONG *count) = 0;
virtual HRESULT STDMETHODCALLTYPE get_isPlaying(
VARIANT_BOOL *playing) = 0;
......@@ -2024,13 +2112,13 @@ interface IVLCPlaylist : public IDispatch
BSTR uri,
VARIANT name,
VARIANT options,
long *itemId) = 0;
LONG *itemId) = 0;
virtual HRESULT STDMETHODCALLTYPE play(
) = 0;
virtual HRESULT STDMETHODCALLTYPE playItem(
long itemId) = 0;
LONG itemId) = 0;
virtual HRESULT STDMETHODCALLTYPE togglePause(
) = 0;
......@@ -2048,7 +2136,7 @@ interface IVLCPlaylist : public IDispatch
) = 0;
virtual HRESULT STDMETHODCALLTYPE removeItem(
long item) = 0;
LONG item) = 0;
virtual HRESULT STDMETHODCALLTYPE get_items(
IVLCPlaylistItems **obj) = 0;
......@@ -2103,7 +2191,7 @@ typedef struct IVLCPlaylistVtbl {
/*** IVLCPlaylist methods ***/
HRESULT (STDMETHODCALLTYPE *get_itemCount)(
IVLCPlaylist* This,
long *count);
LONG *count);
HRESULT (STDMETHODCALLTYPE *get_isPlaying)(
IVLCPlaylist* This,
......@@ -2114,14 +2202,14 @@ typedef struct IVLCPlaylistVtbl {
BSTR uri,
VARIANT name,
VARIANT options,
long *itemId);
LONG *itemId);
HRESULT (STDMETHODCALLTYPE *play)(
IVLCPlaylist* This);
HRESULT (STDMETHODCALLTYPE *playItem)(
IVLCPlaylist* This,
long itemId);
LONG itemId);
HRESULT (STDMETHODCALLTYPE *togglePause)(
IVLCPlaylist* This);
......@@ -2140,7 +2228,7 @@ typedef struct IVLCPlaylistVtbl {
HRESULT (STDMETHODCALLTYPE *removeItem)(
IVLCPlaylist* This,
long item);
LONG item);
HRESULT (STDMETHODCALLTYPE *get_items)(
IVLCPlaylist* This,
......@@ -2181,7 +2269,7 @@ interface IVLCPlaylist {
HRESULT STDMETHODCALLTYPE IVLCPlaylist_get_itemCount_Proxy(
IVLCPlaylist* This,
long *count);
LONG *count);
void __RPC_STUB IVLCPlaylist_get_itemCount_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2200,7 +2288,7 @@ HRESULT STDMETHODCALLTYPE IVLCPlaylist_add_Proxy(
BSTR uri,
VARIANT name,
VARIANT options,
long *itemId);
LONG *itemId);
void __RPC_STUB IVLCPlaylist_add_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2215,7 +2303,7 @@ void __RPC_STUB IVLCPlaylist_play_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCPlaylist_playItem_Proxy(
IVLCPlaylist* This,
long itemId);
LONG itemId);
void __RPC_STUB IVLCPlaylist_playItem_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2258,7 +2346,7 @@ void __RPC_STUB IVLCPlaylist_clear_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCPlaylist_removeItem_Proxy(
IVLCPlaylist* This,
long item);
LONG item);
void __RPC_STUB IVLCPlaylist_removeItem_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2286,16 +2374,16 @@ DEFINE_GUID(IID_IVLCSubtitle, 0x465e787a, 0x0556, 0x452f, 0x94,0x77, 0x95,0x4e,0
interface IVLCSubtitle : public IDispatch
{
virtual HRESULT STDMETHODCALLTYPE get_track(
long *spu) = 0;
LONG *spu) = 0;
virtual HRESULT STDMETHODCALLTYPE put_track(
long spu) = 0;
LONG spu) = 0;
virtual HRESULT STDMETHODCALLTYPE get_count(
long *spuNumber) = 0;
LONG *spuNumber) = 0;
virtual HRESULT STDMETHODCALLTYPE description(
long nameID,
LONG nameID,
BSTR *name) = 0;
};
......@@ -2348,19 +2436,19 @@ typedef struct IVLCSubtitleVtbl {
/*** IVLCSubtitle methods ***/
HRESULT (STDMETHODCALLTYPE *get_track)(
IVLCSubtitle* This,
long *spu);
LONG *spu);
HRESULT (STDMETHODCALLTYPE *put_track)(
IVLCSubtitle* This,
long spu);
LONG spu);
HRESULT (STDMETHODCALLTYPE *get_count)(
IVLCSubtitle* This,
long *spuNumber);
LONG *spuNumber);
HRESULT (STDMETHODCALLTYPE *description)(
IVLCSubtitle* This,
long nameID,
LONG nameID,
BSTR *name);
END_INTERFACE
......@@ -2390,7 +2478,7 @@ interface IVLCSubtitle {
HRESULT STDMETHODCALLTYPE IVLCSubtitle_get_track_Proxy(
IVLCSubtitle* This,
long *spu);
LONG *spu);
void __RPC_STUB IVLCSubtitle_get_track_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2398,7 +2486,7 @@ void __RPC_STUB IVLCSubtitle_get_track_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCSubtitle_put_track_Proxy(
IVLCSubtitle* This,
long spu);
LONG spu);
void __RPC_STUB IVLCSubtitle_put_track_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2406,7 +2494,7 @@ void __RPC_STUB IVLCSubtitle_put_track_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCSubtitle_get_count_Proxy(
IVLCSubtitle* This,
long *spuNumber);
LONG *spuNumber);
void __RPC_STUB IVLCSubtitle_get_count_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
......@@ -2414,7 +2502,7 @@ void __RPC_STUB IVLCSubtitle_get_count_Stub(
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IVLCSubtitle_description_Proxy(
IVLCSubtitle* This,
long nameID,
LONG nameID,
BSTR *name);
void __RPC_STUB IVLCSubtitle_description_Stub(
IRpcStubBuffer* This,
......@@ -2444,28 +2532,28 @@ interface IVLCMarquee : public IDispatch
BSTR text) = 0;
virtual HRESULT STDMETHODCALLTYPE color(
long val) = 0;
LONG val) = 0;
virtual HRESULT STDMETHODCALLTYPE opacity(
long val) = 0;
LONG val) = 0;
virtual HRESULT STDMETHODCALLTYPE position(
long val) = 0;
LONG val) = 0;
virtual HRESULT STDMETHODCALLTYPE refresh(
long val) = 0;
LONG val) = 0;
virtual HRESULT STDMETHODCALLTYPE size(
long val) = 0;
LONG val) = 0;
virtual HRESULT STDMETHODCALLTYPE timeout(
long val) = 0;
LONG val) = 0;