Commit 18c4cbe0 authored by Sam Hocevar's avatar Sam Hocevar

* ./mozilla/vlcshell.cpp: fixed the Mozilla plugin's target drawable.

  * ./modules/video_output/directx/directx.c, ./modules/video_output/x11/x11.c,
    ./modules/video_output/x11/xvideo.c: removed the drawable configuration
    variables which are now deprecated.
parent 5d491d08
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlcplugin.cpp: a VideoLAN Client plugin for Mozilla * vlcplugin.cpp: a VideoLAN Client plugin for Mozilla
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: vlcplugin.cpp,v 1.2 2002/09/30 11:05:41 sam Exp $ * $Id: vlcplugin.cpp,v 1.3 2003/02/01 18:54:10 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
*****************************************************************************/ *****************************************************************************/
VlcPlugin::VlcPlugin( NPP instance ) VlcPlugin::VlcPlugin( NPP instance )
{ {
p_instance = instance; p_instance = instance;
p_peer = NULL; p_peer = NULL;
} }
...@@ -71,11 +71,11 @@ VlcIntf* VlcPlugin::GetPeer() ...@@ -71,11 +71,11 @@ VlcIntf* VlcPlugin::GetPeer()
if( !p_peer ) if( !p_peer )
{ {
p_peer = new VlcPeer( this ); p_peer = new VlcPeer( this );
if( p_peer == NULL ) if( p_peer == NULL )
{ {
return NULL; return NULL;
} }
NS_ADDREF( p_peer ); NS_ADDREF( p_peer );
} }
...@@ -113,6 +113,6 @@ void VlcPlugin::SetFileName(const char * filename) ...@@ -113,6 +113,6 @@ void VlcPlugin::SetFileName(const char * filename)
fclose (fh); fclose (fh);
fprintf(stderr, "File loaded\n"); fprintf(stderr, "File loaded\n");
#endif #endif
return; return;
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlcshell.c: a VideoLAN Client plugin for Mozilla * vlcshell.c: a VideoLAN Client plugin for Mozilla
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: vlcshell.cpp,v 1.8 2003/01/28 16:57:28 sam Exp $ * $Id: vlcshell.cpp,v 1.9 2003/02/01 18:54:10 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -289,7 +289,7 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, ...@@ -289,7 +289,7 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
{ {
p_plugin->psz_target = argv[i]; p_plugin->psz_target = argv[i];
} }
#if USE_LIBVLC #if USE_LIBVLC
else if( !strcmp( argn[i], "loop" ) ) else if( !strcmp( argn[i], "loop" ) )
{ {
...@@ -359,11 +359,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window ) ...@@ -359,11 +359,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
/* FIXME: this cast sucks */ /* FIXME: this cast sucks */
value.i_int = (int) (ptrdiff_t) (void *) window->window; 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, "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 #endif
/* /*
...@@ -469,7 +465,7 @@ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream, ...@@ -469,7 +465,7 @@ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata; VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
#endif #endif
fprintf(stderr, "NPP_NewStream - FILE mode !!\n"); /* fprintf(stderr, "NPP_NewStream - FILE mode !!\n"); */
/* We want a *filename* ! */ /* We want a *filename* ! */
*stype = NP_ASFILE; *stype = NP_ASFILE;
...@@ -495,7 +491,7 @@ int32 NPP_WriteReady( NPP instance, NPStream *stream ) ...@@ -495,7 +491,7 @@ int32 NPP_WriteReady( NPP instance, NPStream *stream )
{ {
VlcPlugin* p_plugin; VlcPlugin* p_plugin;
fprintf(stderr, "NPP_WriteReady\n"); /* fprintf(stderr, "NPP_WriteReady\n"); */
if (instance != NULL) if (instance != NULL)
{ {
...@@ -514,7 +510,7 @@ int32 NPP_WriteReady( NPP instance, NPStream *stream ) ...@@ -514,7 +510,7 @@ int32 NPP_WriteReady( NPP instance, NPStream *stream )
int32 NPP_Write( NPP instance, NPStream *stream, int32 offset, int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
int32 len, void *buffer ) int32 len, void *buffer )
{ {
fprintf(stderr, "NPP_Write %i\n", (int)len); /* fprintf(stderr, "NPP_Write %i\n", (int)len); */
if( instance != NULL ) if( instance != NULL )
{ {
...@@ -543,13 +539,13 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname ) ...@@ -543,13 +539,13 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
return; return;
} }
fprintf(stderr, "NPP_StreamAsFile %s\n", fname); /* fprintf(stderr, "NPP_StreamAsFile %s\n", fname); */
#if USE_LIBVLC #if USE_LIBVLC
/* VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata; */ VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata;
/* VLC_AddTarget( p_plugin->i_vlc, fname, VLC_AddTarget( p_plugin->i_vlc, fname,
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );*/ PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment