/*****************************************************************************
- * vlcshell.c: a VideoLAN Client plugin for Mozilla
+ * vlcshell.cpp: a VLC plugin for Mozilla
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: vlcshell.cpp,v 1.7 2002/11/28 23:53:03 sigmunau Exp $
+ * Copyright (C) 2002-2005 the VideoLAN team
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
-
-/* vlc stuff */
-#include <vlc/vlc.h>
+#include <stdlib.h>
/* Mozilla stuff */
-#include <npapi.h>
-
-#ifdef XP_WIN
- /* Windows stuff */
+#ifdef HAVE_MOZILLA_CONFIG_H
+# include <mozilla-config.h>
#endif
-#ifdef XP_UNIX
- /* X11 stuff */
-# include <X11/Xlib.h>
-# include <X11/Intrinsic.h>
-# include <X11/StringDefs.h>
+/* This is from mozilla java, do we really need it? */
+#if 0
+#include <jri.h>
#endif
-#include "vlcpeer.h"
#include "vlcplugin.h"
-/* XXX: disable VLC */
-#define USE_LIBVLC 1
+/* Enable/disable debugging printf's for X11 resizing */
+#undef X11_RESIZE_DEBUG
-#if USE_LIBVLC
-# define WINDOW_TEXT "(no picture)"
-#else
-# define WINDOW_TEXT "(no libvlc)"
-#endif
+#define WINDOW_TEXT "(no video)"
/*****************************************************************************
* Unix-only declarations
******************************************************************************/
#ifdef XP_UNIX
-# define VOUT_PLUGINS "xvideo,x11,dummy"
-# define AOUT_PLUGINS "oss,dummy"
static void Redraw( Widget w, XtPointer closure, XEvent *event );
+static void Resize( Widget w, XtPointer closure, XEvent *event );
+
+#endif
+
+/*****************************************************************************
+ * MacOS-only declarations
+******************************************************************************/
+#ifdef XP_MACOSX
#endif
/*****************************************************************************
* Windows-only declarations
*****************************************************************************/
#ifdef XP_WIN
-# define VOUT_PLUGINS "directx,dummy"
-# define AOUT_PLUGINS "none" /* "directx,waveout,dummy" */
-HINSTANCE g_hDllInstance = NULL;
+static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar );
-BOOL WINAPI
-DllMain( HINSTANCE hinstDLL, // handle of DLL module
- DWORD fdwReason, // reason for calling function
- LPVOID lpvReserved)
-{
- switch (fdwReason)
- {
- case DLL_PROCESS_ATTACH:
- g_hDllInstance = hinstDLL;
- break;
- case DLL_THREAD_ATTACH:
- case DLL_PROCESS_DETACH:
- case DLL_THREAD_DETACH:
- break;
- }
- return TRUE;
-}
-
-LRESULT CALLBACK Manage( HWND, UINT, WPARAM, LPARAM );
#endif
/******************************************************************************
NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
{
- static nsIID nsid = VLCINTF_IID;
+
static char psz_desc[1000];
+ /* plugin class variables */
switch( variable )
{
case NPPVpluginNameString:
return NPERR_NO_ERROR;
case NPPVpluginDescriptionString:
-#if USE_LIBVLC
- snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, VLC_Version() );
-#else
- snprintf( psz_desc, 1000-1, PLUGIN_DESCRIPTION, "(disabled)" );
-#endif
- psz_desc[1000-1] = 0;
+ snprintf( psz_desc, sizeof(psz_desc), PLUGIN_DESCRIPTION, VLC_Version() );
*((char **)value) = psz_desc;
return NPERR_NO_ERROR;
default:
- /* go on... */
+ /* move on to instance variables ... */
break;
}
return NPERR_INVALID_INSTANCE_ERROR;
}
- VlcPlugin* p_plugin = (VlcPlugin*) instance->pdata;
+ /* plugin instance variables */
+
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
+ if( NULL == p_plugin )
+ {
+ // plugin has not been initialized yet !
+ return NPERR_INVALID_INSTANCE_ERROR;
+ }
switch( variable )
{
- case NPPVpluginScriptableInstance:
- *(nsISupports**)value = p_plugin->GetPeer();
- if( *(nsISupports**)value == NULL )
+ case NPPVpluginScriptableNPObject:
+ /* create an instance and return it */
+ *(NPObject**)value = p_plugin->getScriptObject();
+ if( NULL == *(NPObject**)value )
{
return NPERR_OUT_OF_MEMORY_ERROR;
}
break;
- case NPPVpluginScriptableIID:
- *(nsIID**)value = (nsIID*)NPN_MemAlloc( sizeof(nsIID) );
- if( *(nsIID**)value == NULL )
+ default:
+ return NPERR_GENERIC_ERROR;
+ }
+ return NPERR_NO_ERROR;
+}
+
+/******************************************************************************
+ * Mac-only API calls
+ *****************************************************************************/
+#ifdef XP_MACOSX
+int16 NPP_HandleEvent( NPP instance, void * event )
+{
+ static UInt32 lastMouseUp = 0;
+
+ if( instance == NULL )
+ {
+ return false;
+ }
+
+ VlcPlugin *p_plugin = (VlcPlugin*)instance->pdata;
+ EventRecord *myEvent = (EventRecord*)event;
+
+ switch( myEvent->what )
+ {
+ case nullEvent:
+ break;
+ case mouseDown:
+ {
+ if( (myEvent->when - lastMouseUp) < GetDblTime() )
+ {
+ /* double click */
+ libvlc_instance_t *p_vlc = p_plugin->getVLC();
+
+ if( p_vlc )
+ {
+ if( libvlc_playlist_isplaying(p_vlc, NULL) )
+ {
+ libvlc_input_t *p_input = libvlc_playlist_get_input(p_vlc, NULL);
+ if( p_input )
+ {
+ libvlc_toggle_fullscreen(p_input, NULL);
+ libvlc_input_free(p_input);
+ }
+ }
+ }
+ }
+ return true;
+ }
+ case mouseUp:
+ lastMouseUp = myEvent->when;
+ return true;
+ case keyUp:
+ case keyDown:
+ case autoKey:
+ return true;
+ case updateEvt:
+ {
+ int needsDisplay = TRUE;
+ libvlc_instance_t *p_vlc = p_plugin->getVLC();
+
+ if( p_vlc )
{
- return NPERR_OUT_OF_MEMORY_ERROR;
+ if( libvlc_playlist_isplaying(p_vlc, NULL) )
+ {
+ libvlc_input_t *p_input = libvlc_playlist_get_input(p_vlc, NULL);
+ if( p_input )
+ {
+ needsDisplay = ! libvlc_input_has_vout(p_input, NULL);
+ libvlc_input_free(p_input);
+ }
+ }
}
- **(nsIID**)value = nsid;
- break;
+ const NPWindow *npwindow = p_plugin->getWindow();
+
+ if( needsDisplay && npwindow->window )
+ {
+ /* draw the beautiful "No Picture" */
+
+ ForeColor(blackColor);
+ PenMode( patCopy );
+
+ /* seems that firefox forgets to set the following on occasion (reload) */
+ SetOrigin(((NP_Port *)npwindow->window)->portx, ((NP_Port *)npwindow->window)->porty);
+
+ Rect rect;
+ rect.left = 0;
+ rect.top = 0;
+ rect.right = npwindow->width;
+ rect.bottom = npwindow->height;
+ PaintRect( &rect );
+
+ ForeColor(whiteColor);
+ MoveTo( (npwindow->width-80)/ 2 , npwindow->height / 2 );
+ DrawText( WINDOW_TEXT , 0 , strlen(WINDOW_TEXT) );
+ }
+ return true;
+ }
+ case activateEvt:
+ return false;
+ case NPEventType_GetFocusEvent:
+ case NPEventType_LoseFocusEvent:
+ return true;
+ case NPEventType_AdjustCursorEvent:
+ return false;
+ case NPEventType_MenuCommandEvent:
+ return false;
+ case NPEventType_ClippingChangedEvent:
+ return false;
+ case NPEventType_ScrollingBeginsEvent:
+ case NPEventType_ScrollingEndsEvent:
+ return true;
default:
- return NPERR_GENERIC_ERROR;
+ ;
}
-
- return NPERR_NO_ERROR;
+ return false;
}
+#endif /* XP_MACOSX */
/******************************************************************************
* General Plug-in Calls
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
char* argn[], char* argv[], NPSavedData* saved )
{
- int i;
-#if USE_LIBVLC
- vlc_value_t value;
- int i_ret;
-
- char *ppsz_foo[] =
- {
- "vlc"
- /*, "--plugin-path", "/home/sam/videolan/vlc_MAIN/plugins"*/
- };
-#endif
+ NPError status;
if( instance == NULL )
{
return NPERR_INVALID_INSTANCE_ERROR;
}
- VlcPlugin * p_plugin = new VlcPlugin( instance );
-
- if( p_plugin == NULL )
+ VlcPlugin * p_plugin = new VlcPlugin( instance, mode );
+ if( NULL == p_plugin )
{
return NPERR_OUT_OF_MEMORY_ERROR;
}
- instance->pdata = p_plugin;
-
-#ifdef XP_WIN
- p_plugin->p_hwnd = NULL;
- p_plugin->pf_wndproc = NULL;
-#endif
-
-#ifdef XP_UNIX
- p_plugin->window = 0;
- p_plugin->p_display = NULL;
-#endif
-
- p_plugin->p_npwin = NULL;
- p_plugin->i_npmode = mode;
- p_plugin->i_width = 0;
- p_plugin->i_height = 0;
-
-#if USE_LIBVLC
- p_plugin->i_vlc = VLC_Create();
- if( p_plugin->i_vlc < 0 )
- {
- p_plugin->i_vlc = 0;
- delete p_plugin;
- p_plugin = NULL;
- return NPERR_GENERIC_ERROR;
+ status = p_plugin->init(argc, argn, argv);
+ if( NPERR_NO_ERROR == status ) {
+ instance->pdata = reinterpret_cast<void*>(p_plugin);
}
-
- i_ret = VLC_Init( p_plugin->i_vlc, sizeof(ppsz_foo)/sizeof(char*), ppsz_foo );
- if( i_ret )
- {
- VLC_Destroy( p_plugin->i_vlc );
- p_plugin->i_vlc = 0;
+ else {
delete p_plugin;
- p_plugin = NULL;
- return NPERR_GENERIC_ERROR;
}
-
- value.psz_string = "dummy";
- VLC_Set( p_plugin->i_vlc, "conf::intf", value );
- value.psz_string = VOUT_PLUGINS;
- VLC_Set( p_plugin->i_vlc, "conf::vout", value );
- value.psz_string = AOUT_PLUGINS;
- VLC_Set( p_plugin->i_vlc, "conf::aout", value );
-
-#else
- p_plugin->i_vlc = 1;
-
-#endif /* USE_LIBVLC */
-
- p_plugin->b_stream = VLC_FALSE;
- p_plugin->b_autoplay = VLC_FALSE;
- p_plugin->psz_target = NULL;
-
- for( i = 0; i < argc ; i++ )
- {
- if( !strcmp( argn[i], "target" ) )
- {
- p_plugin->psz_target = argv[i];
- }
- else if( !strcmp( argn[i], "autoplay" ) )
- {
- if( !strcmp( argv[i], "yes" ) )
- {
- p_plugin->b_autoplay = 1;
- }
- }
- else if( !strcmp( argn[i], "autostart" ) )
- {
- if( !strcmp( argv[i], "1" ) || !strcmp( argv[i], "true" ) )
- {
- p_plugin->b_autoplay = 1;
- }
- }
- else if( !strcmp( argn[i], "filename" ) )
- {
- p_plugin->psz_target = argv[i];
- }
- else if( !strcmp( argn[i], "src" ) )
- {
- p_plugin->psz_target = argv[i];
- }
-
-#if USE_LIBVLC
- else if( !strcmp( argn[i], "loop" ) )
- {
- if( !strcmp( argv[i], "yes" ) )
- {
- value.b_bool = VLC_TRUE;
- VLC_Set( p_plugin->i_vlc, "conf::loop", value );
- }
- }
-#endif
- }
-
- if( p_plugin->psz_target )
- {
- p_plugin->psz_target = strdup( p_plugin->psz_target );
- }
-
- return NPERR_NO_ERROR;
+ return status;
}
NPError NPP_Destroy( NPP instance, NPSavedData** save )
{
- if( instance == NULL )
- {
+ if( NULL == instance )
return NPERR_INVALID_INSTANCE_ERROR;
- }
- VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
+ if( NULL == p_plugin )
+ return NPERR_NO_ERROR;
+
+ instance->pdata = NULL;
- if( p_plugin != NULL )
+#if XP_WIN
+ HWND win = (HWND)p_plugin->getWindow()->window;
+ WNDPROC winproc = p_plugin->getWindowProc();
+ if( winproc )
{
- if( p_plugin->i_vlc )
- {
-#if USE_LIBVLC
- VLC_Stop( p_plugin->i_vlc );
- VLC_Destroy( p_plugin->i_vlc );
+ /* reset WNDPROC */
+ SetWindowLong( win, GWL_WNDPROC, (LONG)winproc );
+ }
#endif
- p_plugin->i_vlc = 0;
- }
-
- if( p_plugin->psz_target )
- {
- free( p_plugin->psz_target );
- p_plugin->psz_target = NULL;
- }
+ if( p_plugin )
delete p_plugin;
- }
-
- instance->pdata = NULL;
return NPERR_NO_ERROR;
}
NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
- if( instance == NULL )
+ if( ! instance )
{
return NPERR_INVALID_INSTANCE_ERROR;
}
- VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
-
- /* Write the window ID for vlc */
-#if USE_LIBVLC
- vlc_value_t value;
-
- /* FIXME: this cast sucks */
- value.i_int = (int) (ptrdiff_t) (void *) window->window;
- VLC_Set( p_plugin->i_vlc, "conf::x11-drawable", value );
- VLC_Set( p_plugin->i_vlc, "conf::xvideo-drawable", value );
+ /* NPP_SetWindow may be called before NPP_New (Opera) */
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
+ if( ! p_plugin )
+ {
+ /* we should probably show a splash screen here */
+ return NPERR_NO_ERROR;
+ }
- value.i_int = (int) (ptrdiff_t) (void *) window->window;
- VLC_Set( p_plugin->i_vlc, "conf::directx-window", value );
-#endif
+ libvlc_instance_t *p_vlc = p_plugin->getVLC();
/*
* PLUGIN DEVELOPERS:
* size changes, etc.
*/
-#ifdef XP_WIN
- if( !window || !window->window )
+ const NPWindow *curwin = p_plugin->getWindow();
+
+#ifdef XP_MACOSX
+ if( window && window->window )
{
- /* Window was destroyed. Invalidate everything. */
- if( p_plugin->p_npwin )
+ /* check if plugin has a new parent window */
+ CGrafPtr drawable = (((NP_Port*) (window->window))->port);
+ if( !curwin->window || drawable != (((NP_Port*) (curwin->window))->port) )
{
- SetWindowLong( p_plugin->p_hwnd, GWL_WNDPROC,
- (LONG)p_plugin->pf_wndproc );
- p_plugin->pf_wndproc = NULL;
- p_plugin->p_hwnd = NULL;
+ /* set/change parent window */
+ libvlc_video_set_parent(p_vlc, (libvlc_drawable_t)drawable, NULL);
}
- p_plugin->p_npwin = window;
- return NPERR_NO_ERROR;
+ /* as MacOS X video output is windowless, set viewport */
+ libvlc_rectangle_t view, clip;
+
+ /*
+ ** browser sets port origin to top-left location of plugin relative to GrafPort
+ ** window origin is set relative to document, which of little use for drawing
+ */
+ view.top = ((NP_Port*) (window->window))->porty;
+ view.left = ((NP_Port*) (window->window))->portx;
+ view.bottom = window->height+view.top;
+ view.right = window->width+view.left;
+ /* clipRect coordinates are also relative to GrafPort */
+ clip.top = window->clipRect.top;
+ clip.left = window->clipRect.left;
+ clip.bottom = window->clipRect.bottom;
+ clip.right = window->clipRect.right;
+
+ libvlc_video_set_viewport(p_vlc, &view, &clip, NULL);
+
+ /* remember window details */
+ p_plugin->setWindow(window);
}
+#endif /* XP_MACOSX */
- if( p_plugin->p_npwin )
+#ifdef XP_WIN
+ if( window && window->window )
{
- if( p_plugin->p_hwnd == (HWND)window->window )
+ /* check if plugin has a new parent window */
+ HWND drawable = (HWND) (window->window);
+ if( !curwin->window || drawable != curwin->window )
{
- /* Same window, but something may have changed. First we
- * update the plugin structure, then we redraw the window */
- InvalidateRect( p_plugin->p_hwnd, NULL, TRUE );
- p_plugin->i_width = window->width;
- p_plugin->i_height = window->height;
- p_plugin->p_npwin = window;
- UpdateWindow( p_plugin->p_hwnd );
- return NPERR_NO_ERROR;
+ /* reset previous window settings */
+ HWND oldwin = (HWND)p_plugin->getWindow()->window;
+ WNDPROC oldproc = p_plugin->getWindowProc();
+ if( oldproc )
+ {
+ /* reset WNDPROC */
+ SetWindowLong( oldwin, GWL_WNDPROC, (LONG)oldproc );
+ }
+ /* attach our plugin object */
+ SetWindowLongPtr((HWND)drawable, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(p_plugin));
+
+ /* install our WNDPROC */
+ p_plugin->setWindowProc( (WNDPROC)SetWindowLong( drawable,
+ GWL_WNDPROC, (LONG)Manage ) );
+
+ /* change window style to our liking */
+ LONG style = GetWindowLong((HWND)drawable, GWL_STYLE);
+ style |= WS_CLIPCHILDREN|WS_CLIPSIBLINGS;
+ SetWindowLong((HWND)drawable, GWL_STYLE, style);
+
+ /* change/set parent */
+ libvlc_video_set_parent(p_vlc, (libvlc_drawable_t)drawable, NULL);
}
- /* Window has changed. Destroy the one we have, and go
- * on as if it was a real initialization. */
- SetWindowLong( p_plugin->p_hwnd, GWL_WNDPROC,
- (LONG)p_plugin->pf_wndproc );
- p_plugin->pf_wndproc = NULL;
- p_plugin->p_hwnd = NULL;
- }
+ /* remember window details */
+ p_plugin->setWindow(window);
- p_plugin->pf_wndproc = (WNDPROC)SetWindowLong( (HWND)window->window,
- GWL_WNDPROC, (LONG)Manage );
- p_plugin->p_hwnd = (HWND)window->window;
- SetProp( p_plugin->p_hwnd, "w00t", (HANDLE)p_plugin );
- InvalidateRect( p_plugin->p_hwnd, NULL, TRUE );
- UpdateWindow( p_plugin->p_hwnd );
-#endif
+ /* Redraw window */
+ InvalidateRect( (HWND)drawable, NULL, TRUE );
+ UpdateWindow( (HWND)drawable );
+ }
+ else
+ {
+ /* reset WNDPROC */
+ HWND oldwin = (HWND)curwin->window;
+ SetWindowLong( oldwin, GWL_WNDPROC, (LONG)(p_plugin->getWindowProc()) );
+ p_plugin->setWindowProc(NULL);
+ /* change/set parent */
+ libvlc_video_set_parent(p_vlc, 0, NULL);
+ }
+#endif /* XP_WIN */
#ifdef XP_UNIX
- p_plugin->window = (Window) window->window;
- p_plugin->p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+ if( window && window->window )
+ {
+ Window drawable = (Window) window->window;
+ if( !curwin->window || drawable != (Window)curwin->window )
+ {
+ Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
- Widget w = XtWindowToWidget( p_plugin->p_display, p_plugin->window );
- XtAddEventHandler( w, ExposureMask, FALSE,
- (XtEventHandler)Redraw, p_plugin );
- Redraw( w, (XtPointer)p_plugin, NULL );
-#endif
+ XResizeWindow( p_display, drawable, window->width, window->height );
+ Widget w = XtWindowToWidget( p_display, drawable );
- p_plugin->p_npwin = window;
+ XtAddEventHandler( w, ExposureMask, FALSE, (XtEventHandler)Redraw, p_plugin );
+ XtAddEventHandler( w, StructureNotifyMask, FALSE, (XtEventHandler)Resize, p_plugin );
- p_plugin->i_width = window->width;
- p_plugin->i_height = window->height;
+ /* set/change parent window */
+ libvlc_video_set_parent(p_vlc, (libvlc_drawable_t)drawable, NULL);
- if( !p_plugin->b_stream )
- {
- int i_mode = PLAYLIST_APPEND;
+ /* remember window */
+ p_plugin->setWindow(window);
- if( p_plugin->b_autoplay )
- {
- i_mode |= PLAYLIST_GO;
+ Redraw( w, (XtPointer)p_plugin, NULL );
}
+ }
+#endif /* XP_UNIX */
+ if( !p_plugin->b_stream )
+ {
if( p_plugin->psz_target )
{
-#if USE_LIBVLC
- VLC_AddTarget( p_plugin->i_vlc, p_plugin->psz_target,
- i_mode, PLAYLIST_END );
-#endif
+ if( libvlc_playlist_add( p_vlc, p_plugin->psz_target, NULL, NULL ) != -1 )
+ {
+ if( p_plugin->b_autoplay )
+ {
+ libvlc_playlist_play(p_vlc, 0, 0, NULL, NULL);
+ }
+ }
p_plugin->b_stream = VLC_TRUE;
}
}
-
return NPERR_NO_ERROR;
}
NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
NPBool seekable, uint16 *stype )
{
- if( instance == NULL )
+ if( NULL == instance )
{
return NPERR_INVALID_INSTANCE_ERROR;
}
-#if 0
- VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
-#endif
-
- fprintf(stderr, "NPP_NewStream - FILE mode !!\n");
-
- /* We want a *filename* ! */
- *stype = NP_ASFILE;
+ VlcPlugin *p_plugin = reinterpret_cast<VlcPlugin *>(instance->pdata);
-#if 0
- if( !p_plugin->b_stream )
+ /*
+ ** Firefox/Mozilla may decide to open a stream from the URL specified
+ ** in the SRC parameter of the EMBED tag and pass it to us
+ **
+ ** since VLC will open the SRC URL as well, we're not interested in
+ ** that stream. Otherwise, we'll take it and queue it up in the playlist
+ */
+ if( !p_plugin->psz_target || strcmp(stream->url, p_plugin->psz_target) )
{
- p_plugin->psz_target = strdup( stream->url );
- p_plugin->b_stream = VLC_TRUE;
+ /* TODO: use pipes !!!! */
+ *stype = NP_ASFILEONLY;
+ return NPERR_NO_ERROR;
}
-#endif
-
- return NPERR_NO_ERROR;
+ return NPERR_GENERIC_ERROR;
}
-int32 STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in NPAsFile
- * mode so we can take any size stream in our
- * write call (since we ignore it) */
-
-#define SARASS_SIZE (1024*1024)
-
int32 NPP_WriteReady( NPP instance, NPStream *stream )
{
- VlcPlugin* p_plugin;
-
- fprintf(stderr, "NPP_WriteReady\n");
-
- if (instance != NULL)
- {
- p_plugin = (VlcPlugin*) instance->pdata;
- /* Muahahahahahahaha */
- return STREAMBUFSIZE;
- /*return SARASS_SIZE;*/
- }
-
- /* Number of bytes ready to accept in NPP_Write() */
- return STREAMBUFSIZE;
- /*return 0;*/
+ /* TODO */
+ return 8*1024;
}
int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
int32 len, void *buffer )
{
- fprintf(stderr, "NPP_Write %i\n", (int)len);
-
- if( instance != NULL )
- {
- /*VlcPlugin* p_plugin = (VlcPlugin*) instance->pdata;*/
- }
-
- return len; /* The number of bytes accepted */
+ /* TODO */
+ return len;
}
{
return NPERR_INVALID_INSTANCE_ERROR;
}
-
return NPERR_NO_ERROR;
}
return;
}
- fprintf(stderr, "NPP_StreamAsFile %s\n", fname);
-
-#if USE_LIBVLC
- VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
+ VlcPlugin *p_plugin = reinterpret_cast<VlcPlugin *>(instance->pdata);
-/* VLC_AddTarget( p_plugin->i_vlc, fname,
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );*/
-#endif
+ if( libvlc_playlist_add( p_plugin->getVLC(), fname, stream->url, NULL ) != -1 )
+ {
+ if( p_plugin->b_autoplay )
+ {
+ libvlc_playlist_play( p_plugin->getVLC(), 0, 0, NULL, NULL);
+ }
+ }
}
/******************************************************************************
* Windows-only methods
*****************************************************************************/
-#ifdef XP_WIN
-LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
+#if XP_WIN
+static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
{
- VlcPlugin* p_plugin = (VlcPlugin*) GetProp( p_hwnd, "w00t" );
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(GetWindowLongPtr(p_hwnd, GWLP_USERDATA));
switch( i_msg )
{
-#if !USE_LIBVLC
+ case WM_ERASEBKGND:
+ return 1L;
+
case WM_PAINT:
{
PAINTSTRUCT paintstruct;
hdc = BeginPaint( p_hwnd, &paintstruct );
GetClientRect( p_hwnd, &rect );
- FillRect( hdc, &rect, (HBRUSH)GetStockObject(WHITE_BRUSH) );
- TextOut( hdc, p_plugin->i_width / 2 - 40, p_plugin->i_height / 2,
- WINDOW_TEXT, strlen(WINDOW_TEXT) );
+
+ FillRect( hdc, &rect, (HBRUSH)GetStockObject(BLACK_BRUSH) );
+ SetTextColor(hdc, RGB(255, 255, 255));
+ SetBkColor(hdc, RGB(0, 0, 0));
+ DrawText( hdc, WINDOW_TEXT, strlen(WINDOW_TEXT), &rect, DT_CENTER|DT_VCENTER|DT_SINGLELINE);
EndPaint( p_hwnd, &paintstruct );
- break;
+ return 0L;
}
-#endif
default:
- p_plugin->pf_wndproc( p_hwnd, i_msg, wpar, lpar );
- break;
+ /* delegate to default handler */
+ return p_plugin->getWindowProc()( p_hwnd, i_msg, wpar, lpar );
}
- return 0;
}
-#endif
+#endif /* XP_WIN */
/******************************************************************************
* UNIX-only methods
#ifdef XP_UNIX
static void Redraw( Widget w, XtPointer closure, XEvent *event )
{
- VlcPlugin* p_plugin = (VlcPlugin*)closure;
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(closure);
+ const NPWindow *window = p_plugin->getWindow();
GC gc;
XGCValues gcv;
- gcv.foreground = BlackPixel( p_plugin->p_display, 0 );
- gc = XCreateGC( p_plugin->p_display, p_plugin->window, GCForeground, &gcv );
+ Window drawable = (Window) window->window;
+ Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+
+ gcv.foreground = BlackPixel( p_display, 0 );
+ gc = XCreateGC( p_display, drawable, GCForeground, &gcv );
- XFillRectangle( p_plugin->p_display, p_plugin->window, gc,
- 0, 0, p_plugin->i_width, p_plugin->i_height );
+ XFillRectangle( p_display, drawable, gc,
+ 0, 0, window->width, window->height );
- gcv.foreground = WhitePixel( p_plugin->p_display, 0 );
- XChangeGC( p_plugin->p_display, gc, GCForeground, &gcv );
+ gcv.foreground = WhitePixel( p_display, 0 );
+ XChangeGC( p_display, gc, GCForeground, &gcv );
- XDrawString( p_plugin->p_display, p_plugin->window, gc,
- p_plugin->i_width / 2 - 40, p_plugin->i_height / 2,
+ XDrawString( p_display, drawable, gc,
+ window->width / 2 - 40, window->height / 2,
WINDOW_TEXT, strlen(WINDOW_TEXT) );
- XFreeGC( p_plugin->p_display, gc );
+ XFreeGC( p_display, gc );
}
-#endif
+
+static void Resize ( Widget w, XtPointer closure, XEvent *event )
+{
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(closure);
+ const NPWindow *window = p_plugin->getWindow();
+ Window drawable = (Window) window->window;
+ Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+
+ int i_ret;
+ Window root_return, parent_return, * children_return;
+ Window base_window;
+ unsigned int i_nchildren;
+
+#ifdef X11_RESIZE_DEBUG
+ XWindowAttributes attr;
+
+ if( event && event->type == ConfigureNotify )
+ {
+ fprintf( stderr, "vlcshell::Resize() ConfigureNotify %d x %d, "
+ "send_event ? %s\n", event->xconfigure.width,
+ event->xconfigure.height,
+ event->xconfigure.send_event ? "TRUE" : "FALSE" );
+ }
+#endif /* X11_RESIZE_DEBUG */
+
+ if( ! p_plugin->setSize(window->width, window->height) )
+ {
+ /* size already set */
+ return;
+ }
+
+
+ i_ret = XResizeWindow( p_display, drawable, window->width, window->height );
+
+#ifdef X11_RESIZE_DEBUG
+ fprintf( stderr,
+ "vlcshell::Resize() XResizeWindow(owner) returned %d\n", i_ret );
+
+ XGetWindowAttributes ( p_display, drawable, &attr );
+
+ /* X is asynchronous, so the current size reported here is not
+ necessarily the requested size as the Resize request may not
+ yet have been handled by the plugin host */
+ fprintf( stderr, "vlcshell::Resize() current (owner) size %d x %d\n",
+ attr.width, attr.height );
+#endif /* X11_RESIZE_DEBUG */
+
+ XQueryTree( p_display, drawable,
+ &root_return, &parent_return, &children_return,
+ &i_nchildren );
+
+ if( i_nchildren > 0 )
+ {
+ /* XXX: Make assumptions related to the window parenting structure in
+ vlc/modules/video_output/x11/xcommon.c */
+ base_window = children_return[i_nchildren - 1];
+
+#ifdef X11_RESIZE_DEBUG
+ fprintf( stderr, "vlcshell::Resize() got %d children\n", i_nchildren );
+ fprintf( stderr, "vlcshell::Resize() got base_window %p\n",
+ base_window );
+#endif /* X11_RESIZE_DEBUG */
+
+ i_ret = XResizeWindow( p_display, base_window,
+ window->width, window->height );
+
+#ifdef X11_RESIZE_DEBUG
+ fprintf( stderr,
+ "vlcshell::Resize() XResizeWindow(base) returned %d\n",
+ i_ret );
+
+ XGetWindowAttributes( p_display, base_window, &attr );
+
+ fprintf( stderr, "vlcshell::Resize() new size %d x %d\n",
+ attr.width, attr.height );
+#endif /* X11_RESIZE_DEBUG */
+ }
+}
+
+#endif /* XP_UNIX */
projects / vlc / blobdiff