* vlcshell.c: a VideoLAN Client plugin for Mozilla
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: vlcshell.cpp,v 1.2 2002/09/30 11:05:41 sam Exp $
+ * $Id: vlcshell.cpp,v 1.7 2002/11/28 23:53:03 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/* vlc stuff */
#include <vlc/vlc.h>
-#include "config.h"
/* Mozilla stuff */
#include <npapi.h>
-#ifdef WIN32
+#ifdef XP_WIN
+ /* Windows stuff */
+#endif
-#else
+#ifdef XP_UNIX
/* X11 stuff */
# include <X11/Xlib.h>
# include <X11/Intrinsic.h>
#include "vlcpeer.h"
#include "vlcplugin.h"
+/* XXX: disable VLC */
+#define USE_LIBVLC 1
+
+#if USE_LIBVLC
+# define WINDOW_TEXT "(no picture)"
+#else
+# define WINDOW_TEXT "(no libvlc)"
+#endif
+
/*****************************************************************************
* Unix-only declarations
******************************************************************************/
-#ifndef WIN32
+#ifdef XP_UNIX
+# define VOUT_PLUGINS "xvideo,x11,dummy"
+# define AOUT_PLUGINS "oss,dummy"
+
static void Redraw( Widget w, XtPointer closure, XEvent *event );
#endif
/*****************************************************************************
* Windows-only declarations
*****************************************************************************/
-#ifdef WIN32
+#ifdef XP_WIN
+# define VOUT_PLUGINS "directx,dummy"
+# define AOUT_PLUGINS "none" /* "directx,waveout,dummy" */
+
HINSTANCE g_hDllInstance = NULL;
BOOL WINAPI
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;
+ 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];
switch( variable )
{
return NPERR_NO_ERROR;
case NPPVpluginDescriptionString:
- *((char **)value) = PLUGIN_DESCRIPTION;
+#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;
+ *((char **)value) = psz_desc;
return NPERR_NO_ERROR;
+
+ default:
+ /* go on... */
+ break;
}
if( instance == NULL )
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
char* argn[], char* argv[], NPSavedData* saved )
{
- int i_ret;
int i;
+#if USE_LIBVLC
+ vlc_value_t value;
+ int i_ret;
char *ppsz_foo[] =
{
"vlc"
/*, "--plugin-path", "/home/sam/videolan/vlc_MAIN/plugins"*/
- , "--vout", "xvideo,x11,dummy"
- , "--aout", "dsp"
- , "--intf", "dummy"
- /*, "--noaudio"*/
- /*, "-q"*/
- , "-v"
};
+#endif
if( instance == NULL )
{
instance->pdata = p_plugin;
- p_plugin->fMode = mode;
- p_plugin->fWindow = NULL;
+#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;
- p_plugin->p_vlc = vlc_create_r();
- if( p_plugin->p_vlc == NULL )
+#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;
}
- i_ret = vlc_init_r( p_plugin->p_vlc, sizeof(ppsz_foo)/sizeof(char*), ppsz_foo );
+ i_ret = VLC_Init( p_plugin->i_vlc, sizeof(ppsz_foo)/sizeof(char*), ppsz_foo );
if( i_ret )
{
- vlc_destroy_r( p_plugin->p_vlc );
- p_plugin->p_vlc = NULL;
+ VLC_Destroy( p_plugin->i_vlc );
+ p_plugin->i_vlc = 0;
delete p_plugin;
p_plugin = NULL;
return NPERR_GENERIC_ERROR;
}
- vlc_set_r( p_plugin->p_vlc, "vout", "xvideo,x11,dummy" );
- vlc_set_r( p_plugin->p_vlc, "intf", "dummy" );
+ 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 = 0;
- p_plugin->b_autoplay = 0;
+ p_plugin->b_stream = VLC_FALSE;
+ p_plugin->b_autoplay = VLC_FALSE;
p_plugin->psz_target = NULL;
for( i = 0; i < argc ; i++ )
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" ) )
{
- vlc_set_r( p_plugin->p_vlc, "loop", "1" );
+ value.b_bool = VLC_TRUE;
+ VLC_Set( p_plugin->i_vlc, "conf::loop", value );
}
}
+#endif
}
if( p_plugin->psz_target )
if( p_plugin != NULL )
{
- if( p_plugin->p_vlc != NULL )
+ if( p_plugin->i_vlc )
{
- vlc_stop_r( p_plugin->p_vlc );
- vlc_destroy_r( p_plugin->p_vlc );
- p_plugin->p_vlc = NULL;
+#if USE_LIBVLC
+ VLC_Stop( p_plugin->i_vlc );
+ VLC_Destroy( p_plugin->i_vlc );
+#endif
+ p_plugin->i_vlc = 0;
}
if( p_plugin->psz_target )
NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
- char psz_window[32];
-
if( instance == NULL )
{
return NPERR_INVALID_INSTANCE_ERROR;
VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
/* Write the window ID for vlc */
- sprintf( psz_window, "%li", (long int)window->window );
- vlc_set_r( p_plugin->p_vlc, "x11-drawable", psz_window );
- vlc_set_r( p_plugin->p_vlc, "xvideo-drawable", psz_window );
+#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 );
+
+ value.i_int = (int) (ptrdiff_t) (void *) window->window;
+ VLC_Set( p_plugin->i_vlc, "conf::directx-window", value );
+#endif
/*
* PLUGIN DEVELOPERS:
* size changes, etc.
*/
- Widget netscape_widget;
+#ifdef XP_WIN
+ if( !window || !window->window )
+ {
+ /* Window was destroyed. Invalidate everything. */
+ if( p_plugin->p_npwin )
+ {
+ SetWindowLong( p_plugin->p_hwnd, GWL_WNDPROC,
+ (LONG)p_plugin->pf_wndproc );
+ p_plugin->pf_wndproc = NULL;
+ p_plugin->p_hwnd = NULL;
+ }
+
+ p_plugin->p_npwin = window;
+ return NPERR_NO_ERROR;
+ }
+
+ if( p_plugin->p_npwin )
+ {
+ if( p_plugin->p_hwnd == (HWND)window->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;
+ }
+
+ /* 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;
+ }
+ 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
+
+#ifdef XP_UNIX
p_plugin->window = (Window) window->window;
- p_plugin->x = window->x;
- p_plugin->y = window->y;
- p_plugin->width = window->width;
- p_plugin->height = window->height;
- p_plugin->display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+ p_plugin->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
- netscape_widget = XtWindowToWidget(p_plugin->display, p_plugin->window);
- XtAddEventHandler(netscape_widget, ExposureMask, FALSE, (XtEventHandler)Redraw, p_plugin);
- Redraw(netscape_widget, (XtPointer)p_plugin, NULL);
+ p_plugin->p_npwin = window;
- p_plugin->fWindow = window;
+ p_plugin->i_width = window->width;
+ p_plugin->i_height = window->height;
-#if 1
if( !p_plugin->b_stream )
{
int i_mode = PLAYLIST_APPEND;
if( p_plugin->psz_target )
{
- vlc_add_target_r( p_plugin->p_vlc, p_plugin->psz_target,
- i_mode, PLAYLIST_END );
- p_plugin->b_stream = 1;
+#if USE_LIBVLC
+ VLC_AddTarget( p_plugin->i_vlc, p_plugin->psz_target,
+ i_mode, PLAYLIST_END );
+#endif
+ p_plugin->b_stream = VLC_TRUE;
}
}
-#endif
return NPERR_NO_ERROR;
}
*stype = NP_ASFILE;
#if 0
- if( p_plugin->b_stream == 0 )
+ if( !p_plugin->b_stream )
{
p_plugin->psz_target = strdup( stream->url );
- p_plugin->b_stream = 1;
+ p_plugin->b_stream = VLC_TRUE;
}
#endif
int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
int32 len, void *buffer )
{
- fprintf(stderr, "NPP_Write %i\n", len);
+ fprintf(stderr, "NPP_Write %i\n", (int)len);
if( instance != NULL )
{
return;
}
- VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
+ fprintf(stderr, "NPP_StreamAsFile %s\n", fname);
- fprintf(stderr, "NPP_StreamAsFile\n");
- vlc_add_target_r( p_plugin->p_vlc, fname,
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
-}
-
-#if 0
-void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
-{
- fprintf(stderr,"filename : %s\n", fname);
- ((VlcPlugin*) instance->pdata)->SetFileName(fname);
+#if USE_LIBVLC
+ VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
- fprintf(stderr,"SetFileNeme ok. \n");
-}
+/* VLC_AddTarget( p_plugin->i_vlc, fname,
+ PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );*/
#endif
+}
void NPP_URLNotify( NPP instance, const char* url,
}
}
+/******************************************************************************
+ * Windows-only methods
+ *****************************************************************************/
+#ifdef XP_WIN
+LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
+{
+ VlcPlugin* p_plugin = (VlcPlugin*) GetProp( p_hwnd, "w00t" );
+
+ switch( i_msg )
+ {
+#if !USE_LIBVLC
+ case WM_PAINT:
+ {
+ PAINTSTRUCT paintstruct;
+ HDC hdc;
+ RECT rect;
+
+ 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) );
+
+ EndPaint( p_hwnd, &paintstruct );
+ break;
+ }
+#endif
+ default:
+ p_plugin->pf_wndproc( p_hwnd, i_msg, wpar, lpar );
+ break;
+ }
+ return 0;
+}
+#endif
+
/******************************************************************************
* UNIX-only methods
*****************************************************************************/
-#ifndef WIN32
+#ifdef XP_UNIX
static void Redraw( Widget w, XtPointer closure, XEvent *event )
{
VlcPlugin* p_plugin = (VlcPlugin*)closure;
GC gc;
XGCValues gcv;
- const char * psz_text = "(no picture)";
- gcv.foreground = BlackPixel( p_plugin->display, 0 );
- gc = XCreateGC( p_plugin->display, p_plugin->window, GCForeground, &gcv );
+ gcv.foreground = BlackPixel( p_plugin->p_display, 0 );
+ gc = XCreateGC( p_plugin->p_display, p_plugin->window, GCForeground, &gcv );
- XFillRectangle( p_plugin->display, p_plugin->window, gc,
- 0, 0, p_plugin->width, p_plugin->height );
+ XFillRectangle( p_plugin->p_display, p_plugin->window, gc,
+ 0, 0, p_plugin->i_width, p_plugin->i_height );
- gcv.foreground = WhitePixel( p_plugin->display, 0 );
- XChangeGC( p_plugin->display, gc, GCForeground, &gcv );
+ gcv.foreground = WhitePixel( p_plugin->p_display, 0 );
+ XChangeGC( p_plugin->p_display, gc, GCForeground, &gcv );
- XDrawString( p_plugin->display, p_plugin->window, gc,
- p_plugin->width / 2 - 40, p_plugin->height / 2,
- psz_text, strlen(psz_text) );
+ XDrawString( p_plugin->p_display, p_plugin->window, gc,
+ p_plugin->i_width / 2 - 40, p_plugin->i_height / 2,
+ WINDOW_TEXT, strlen(WINDOW_TEXT) );
- XFreeGC( p_plugin->display, gc );
+ XFreeGC( p_plugin->p_display, gc );
}
#endif
projects / vlc / blobdiff