[Mplayerplug-in-cvs] mplayerplug-in/Source nsIScriptableMplayerPlugin.h,1.8,1.9 nsIScriptableMplayer
Brought to you by:
kdekorte
Menu
▾
▴
[Mplayerplug-in-cvs] mplayerplug-in/Source nsIScriptableMplayerPlugin.h,1.8,1.9 nsIScriptableMplayerPlugin.idl,1.7,1.8 nsIScriptableMplayerPlugin.xpt,1.6,1.7 nsScriptablePeer.cpp,1.8,1.9 plugin-setup.cpp,1.22,1.23 plugin-ui.cpp,1.54,1.55
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10287/Source Modified Files: nsIScriptableMplayerPlugin.h nsIScriptableMplayerPlugin.idl nsIScriptableMplayerPlugin.xpt nsScriptablePeer.cpp plugin-setup.cpp plugin-ui.cpp Log Message: Changed case of javascript commands to have first letter uppercased Index: plugin-ui.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** plugin-ui.cpp 23 Mar 2004 17:48:32 -0000 1.54 --- plugin-ui.cpp 24 Mar 2004 19:45:24 -0000 1.55 *************** *** 868,871 **** --- 868,873 ---- if (instance->mode == NP_FULL) instance->panel_height = instance->window_height; + if (instance->panel_height > 16) + instance->panel_height = 16; if (0) printf("drawing panel\n height = %i panel= %i\n", *************** *** 1078,1082 **** (width * multiplier + 10), instance->embed_height - height + 2); ! gtk_widget_show(GTK_WIDGET(instance->mediaprogress_bar)); } --- 1080,1084 ---- (width * multiplier + 10), instance->embed_height - height + 2); ! //gtk_widget_show(GTK_WIDGET(instance->mediaprogress_bar)); } *************** *** 1155,1158 **** --- 1157,1161 ---- if (instance->mediaprogress_bar != NULL) { if ((instance->mediaPercent > 0) && (instance->mediaPercent < 100)) { + gtk_widget_show(GTK_WIDGET(instance->mediaprogress_bar)); gtk_progress_bar_update(instance->mediaprogress_bar, instance->mediaPercent / 100.0); Index: nsIScriptableMplayerPlugin.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsIScriptableMplayerPlugin.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** nsIScriptableMplayerPlugin.h 19 Mar 2004 21:48:04 -0000 1.8 --- nsIScriptableMplayerPlugin.h 24 Mar 2004 19:45:23 -0000 1.9 *************** *** 28,38 **** 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; --- 28,38 ---- 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; *************** *** 40,47 **** NS_IMETHOD Quit(void) = 0; ! /* void doPlay (); */ NS_IMETHOD DoPlay(void) = 0; ! /* void doPause (); */ NS_IMETHOD DoPause(void) = 0; --- 40,47 ---- NS_IMETHOD Quit(void) = 0; ! /* void DoPlay (); */ NS_IMETHOD DoPlay(void) = 0; ! /* void DoPause (); */ NS_IMETHOD DoPause(void) = 0; *************** *** 80,83 **** --- 80,87 ---- NS_IMETHOD SetFilename(const char * aFilename) = 0; + /* attribute boolean ShowControls; */ + NS_IMETHOD GetShowControls(PRBool *aShowControls) = 0; + NS_IMETHOD SetShowControls(PRBool aShowControls) = 0; + /* readonly attribute long playState; */ NS_IMETHOD GetPlayState(PRInt32 *aPlayState) = 0; *************** *** 105,108 **** --- 109,114 ---- NS_IMETHOD GetFilename(char * *aFilename); \ NS_IMETHOD SetFilename(const char * aFilename); \ + NS_IMETHOD GetShowControls(PRBool *aShowControls); \ + NS_IMETHOD SetShowControls(PRBool aShowControls); \ NS_IMETHOD GetPlayState(PRInt32 *aPlayState); *************** *** 127,130 **** --- 133,138 ---- NS_IMETHOD GetFilename(char * *aFilename) { return _to GetFilename(aFilename); } \ NS_IMETHOD SetFilename(const char * aFilename) { return _to SetFilename(aFilename); } \ + NS_IMETHOD GetShowControls(PRBool *aShowControls) { return _to GetShowControls(aShowControls); } \ + NS_IMETHOD SetShowControls(PRBool aShowControls) { return _to SetShowControls(aShowControls); } \ NS_IMETHOD GetPlayState(PRInt32 *aPlayState) { return _to GetPlayState(aPlayState); } *************** *** 149,152 **** --- 157,162 ---- NS_IMETHOD GetFilename(char * *aFilename) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetFilename(aFilename); } \ NS_IMETHOD SetFilename(const char * aFilename) { return !_to ? NS_ERROR_NULL_POINTER : _to->SetFilename(aFilename); } \ + NS_IMETHOD GetShowControls(PRBool *aShowControls) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetShowControls(aShowControls); } \ + NS_IMETHOD SetShowControls(PRBool aShowControls) { return !_to ? NS_ERROR_NULL_POINTER : _to->SetShowControls(aShowControls); } \ NS_IMETHOD GetPlayState(PRInt32 *aPlayState) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetPlayState(aPlayState); } *************** *** 179,183 **** } ! /* void play (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::Play() { --- 189,193 ---- } ! /* void Play (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::Play() { *************** *** 185,189 **** } ! /* void pause (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::Pause() { --- 195,199 ---- } ! /* void Pause (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::Pause() { *************** *** 191,195 **** } ! /* void stop (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::Stop() { --- 201,205 ---- } ! /* void Stop (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::Stop() { *************** *** 203,207 **** } ! /* void doPlay (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::DoPlay() { --- 213,217 ---- } ! /* void DoPlay (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::DoPlay() { *************** *** 209,213 **** } ! /* void doPause (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::DoPause() { --- 219,223 ---- } ! /* void DoPause (); */ NS_IMETHODIMP nsScriptableMplayerPlugin::DoPause() { *************** *** 285,288 **** --- 295,308 ---- } + /* attribute boolean ShowControls; */ + NS_IMETHODIMP nsScriptableMplayerPlugin::GetShowControls(PRBool *aShowControls) + { + return NS_ERROR_NOT_IMPLEMENTED; + } + NS_IMETHODIMP nsScriptableMplayerPlugin::SetShowControls(PRBool aShowControls) + { + return NS_ERROR_NOT_IMPLEMENTED; + } + /* readonly attribute long playState; */ NS_IMETHODIMP nsScriptableMplayerPlugin::GetPlayState(PRInt32 *aPlayState) Index: nsIScriptableMplayerPlugin.xpt =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsIScriptableMplayerPlugin.xpt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsf6kLf8 and /tmp/cvstsDXxJ differ Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** plugin-setup.cpp 20 Mar 2004 20:25:57 -0000 1.22 --- plugin-setup.cpp 24 Mar 2004 19:45:24 -0000 1.23 *************** *** 351,358 **** char parse[1000]; char *cp; ! instance->mode = parameters->mode; instance->mInstance = parameters->instance; ! if (parameters->mode == NP_EMBED) { --- 351,358 ---- char parse[1000]; char *cp; ! instance->mode = parameters->mode; instance->mInstance = parameters->instance; ! if (parameters->mode == NP_EMBED) { Index: nsIScriptableMplayerPlugin.idl =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsIScriptableMplayerPlugin.idl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nsIScriptableMplayerPlugin.idl 19 Mar 2004 21:48:04 -0000 1.7 --- nsIScriptableMplayerPlugin.idl 24 Mar 2004 19:45:24 -0000 1.8 *************** *** 3,12 **** interface nsIScriptableMplayerPlugin : nsISupports { ! void play(); ! void pause(); ! void stop(); void quit(); ! void doPlay(); ! void doPause(); void FastForward(); void FastReverse(); --- 3,12 ---- interface nsIScriptableMplayerPlugin : nsISupports { ! void Play(); ! void Pause(); ! void Stop(); void quit(); ! void DoPlay(); ! void DoPause(); void FastForward(); void FastReverse(); *************** *** 20,23 **** --- 20,24 ---- double getPercent(); attribute string filename; + attribute boolean ShowControls; readonly attribute long playState; }; Index: nsScriptablePeer.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/nsScriptablePeer.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** nsScriptablePeer.cpp 19 Mar 2004 21:48:04 -0000 1.8 --- nsScriptablePeer.cpp 24 Mar 2004 19:45:24 -0000 1.9 *************** *** 257,258 **** --- 257,270 ---- return NS_OK; } + + NS_IMETHODIMP nsScriptablePeer::GetShowControls(PRBool *aShowControls) + { + printf("JS GetShowControls issued\n"); + return NS_OK; + } + + NS_IMETHODIMP nsScriptablePeer::SetShowControls(PRBool aShowControls) + { + printf("JS SetShowControls issued\n"); + return NS_OK; + } |