Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source nsIScriptableMplayerPlugin.h,1.2,1.3 nsIScriptableMplayer
Brought to you by:
kdekorte
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10338/Source Modified Files: nsIScriptableMplayerPlugin.h nsIScriptableMplayerPlugin.idl nsIScriptableMplayerPlugin.xpt nsScriptablePeer.cpp Log Message: Remerge javascript seek patch Index: nsIScriptableMplayerPlugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsIScriptableMplayerPlugin.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nsIScriptableMplayerPlugin.h 13 Feb 2004 14:45:47 -0000 1.2 --- nsIScriptableMplayerPlugin.h 2 Mar 2004 14:50:45 -0000 1.3 *************** *** 23,66 **** { 0x66, 0x66, 0xfb, 0x9f, 0x41, 0x4f, 0x24, 0x65 }} ! class NS_NO_VTABLE nsIScriptableMplayerPlugin:public nsISupports { ! public: ! NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCRIPTABLEMPLAYERPLUGIN_IID) ! /* void play (); */ ! NS_IMETHOD Play(void) = 0; ! /* void pause (); */ ! NS_IMETHOD Pause(void) = 0; ! /* void stop (); */ ! NS_IMETHOD Stop(void) = 0; ! /* void quit (); */ ! NS_IMETHOD Quit(void) = 0; ! /* void doPlay (); */ ! NS_IMETHOD DoPlay(void) = 0; ! /* void doPause (); */ ! NS_IMETHOD DoPause(void) = 0; ! /* void FastForward (); */ ! NS_IMETHOD FastForward(void) = 0; ! /* void FastReverse (); */ ! NS_IMETHOD FastReverse(void) = 0; ! /* void ff (); */ ! NS_IMETHOD Ff(void) = 0; ! /* void rew (); */ ! NS_IMETHOD Rew(void) = 0; ! /* void rewind (); */ ! NS_IMETHOD Rewind(void) = 0; ! /* readonly attribute long playState; */ ! NS_IMETHOD GetPlayState(PRInt32 * aPlayState) = 0; }; --- 23,69 ---- { 0x66, 0x66, 0xfb, 0x9f, 0x41, 0x4f, 0x24, 0x65 }} ! class NS_NO_VTABLE nsIScriptableMplayerPlugin : public nsISupports { ! public: ! NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCRIPTABLEMPLAYERPLUGIN_IID) ! /* void play (); */ ! NS_IMETHOD Play(void) = 0; ! /* void pause (); */ ! NS_IMETHOD Pause(void) = 0; ! /* void stop (); */ ! NS_IMETHOD Stop(void) = 0; ! /* void quit (); */ ! NS_IMETHOD Quit(void) = 0; ! /* void doPlay (); */ ! NS_IMETHOD DoPlay(void) = 0; ! /* void doPause (); */ ! NS_IMETHOD DoPause(void) = 0; ! /* void FastForward (); */ ! NS_IMETHOD FastForward(void) = 0; ! /* void FastReverse (); */ ! NS_IMETHOD FastReverse(void) = 0; ! /* void ff (); */ ! NS_IMETHOD Ff(void) = 0; ! /* void rew (); */ ! NS_IMETHOD Rew(void) = 0; ! /* void rewind (); */ ! NS_IMETHOD Rewind(void) = 0; ! /* void Seek (in double value); */ ! NS_IMETHOD Seek(double value) = 0; ! ! /* readonly attribute long playState; */ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState) = 0; }; *************** *** 79,83 **** NS_IMETHOD Rew(void); \ NS_IMETHOD Rewind(void); \ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState); /* Use this macro to declare functions that forward the behavior of this interface to another object. */ --- 82,87 ---- NS_IMETHOD Rew(void); \ NS_IMETHOD Rewind(void); \ ! NS_IMETHOD Seek(double value); \ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState); /* Use this macro to declare functions that forward the behavior of this interface to another object. */ *************** *** 94,98 **** NS_IMETHOD Rew(void) { return _to Rew(); } \ NS_IMETHOD Rewind(void) { return _to Rewind(); } \ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState) { return _to GetPlayState(aPlayState); } /* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */ --- 98,103 ---- NS_IMETHOD Rew(void) { return _to Rew(); } \ NS_IMETHOD Rewind(void) { return _to Rewind(); } \ ! NS_IMETHOD Seek(double value) { return _to Seek(value); } \ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState) { return _to GetPlayState(aPlayState); } /* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */ *************** *** 109,113 **** NS_IMETHOD Rew(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Rew(); } \ NS_IMETHOD Rewind(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Rewind(); } \ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPlayState(aPlayState); } #if 0 --- 114,119 ---- NS_IMETHOD Rew(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Rew(); } \ NS_IMETHOD Rewind(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Rewind(); } \ ! NS_IMETHOD Seek(double value) { return !_to ? NS_ERROR_NULL_POINTER : _to->Seek(value); } \ ! NS_IMETHOD GetPlayState(PRInt32 *aPlayState) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPlayState(aPlayState); } #if 0 *************** *** 115,124 **** /* Header file */ ! class nsScriptableMplayerPlugin:public nsIScriptableMplayerPlugin { ! public: ! NS_DECL_ISUPPORTS ! NS_DECL_NSISCRIPTABLEMPLAYERPLUGIN nsScriptableMplayerPlugin(); ! virtual ~ nsScriptableMplayerPlugin(); ! /* additional members */ }; --- 121,133 ---- /* Header file */ ! class nsScriptableMplayerPlugin : public nsIScriptableMplayerPlugin ! { ! public: ! NS_DECL_ISUPPORTS ! NS_DECL_NSISCRIPTABLEMPLAYERPLUGIN ! ! nsScriptableMplayerPlugin(); ! virtual ~nsScriptableMplayerPlugin(); ! /* additional members */ }; *************** *** 126,137 **** NS_IMPL_ISUPPORTS1(nsScriptableMplayerPlugin, nsIScriptableMplayerPlugin) ! nsScriptableMplayerPlugin::nsScriptableMplayerPlugin() { ! /* member initializers and constructor code */ } nsScriptableMplayerPlugin::~nsScriptableMplayerPlugin() { ! /* destructor code */ } --- 135,146 ---- NS_IMPL_ISUPPORTS1(nsScriptableMplayerPlugin, nsIScriptableMplayerPlugin) ! nsScriptableMplayerPlugin::nsScriptableMplayerPlugin() { ! /* member initializers and constructor code */ } nsScriptableMplayerPlugin::~nsScriptableMplayerPlugin() { ! /* destructor code */ } *************** *** 202,207 **** } /* readonly attribute long playState; */ ! NS_IMETHODIMP nsScriptableMplayerPlugin::GetPlayState(PRInt32 * aPlayState) { return NS_ERROR_NOT_IMPLEMENTED; --- 211,222 ---- } + /* void Seek (in double value); */ + NS_IMETHODIMP nsScriptableMplayerPlugin::Seek(double value) + { + return NS_ERROR_NOT_IMPLEMENTED; + } + /* readonly attribute long playState; */ ! NS_IMETHODIMP nsScriptableMplayerPlugin::GetPlayState(PRInt32 *aPlayState) { return NS_ERROR_NOT_IMPLEMENTED; *************** *** 212,214 **** ! #endif /* __gen_nsIScriptableMplayerPlugin_h__ */ --- 227,229 ---- ! #endif /* __gen_nsIScriptableMplayerPlugin_h__ */ Index: nsIScriptableMplayerPlugin.idl =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsIScriptableMplayerPlugin.idl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nsIScriptableMplayerPlugin.idl 5 Feb 2004 00:34:51 -0000 1.1.1.1 --- nsIScriptableMplayerPlugin.idl 2 Mar 2004 14:50:45 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- void rew(); void rewind(); + void Seek(in double value); readonly attribute long playState; }; Index: nsIScriptableMplayerPlugin.xpt =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsIScriptableMplayerPlugin.xpt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsz1o4cS and /tmp/cvsxBEiSx differ Index: nsScriptablePeer.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsScriptablePeer.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nsScriptablePeer.cpp 5 Feb 2004 00:34:49 -0000 1.1.1.1 --- nsScriptablePeer.cpp 2 Mar 2004 14:50:45 -0000 1.2 *************** *** 200,203 **** --- 200,209 ---- } + NS_IMETHODIMP nsScriptablePeer::Seek(double counter) + { + printf("JS Seek issued\n"); + mPlugin->Seek(counter); + return NS_OK; + } NS_IMETHODIMP nsScriptablePeer::GetPlayState(PRInt32 * aPlayState) |