Skip to content

V
vlc-gpu
Commit c8be4195 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

mozilla: no longer use libvlc depreceated API 

Original rewrite done by JP Dinger <jpd@m2x.nl> and cleaned up by jpsaman.
parent e3965395
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 351 additions and 211 deletions
projects/mozilla/control/npolibvlc.cpp
View file @ c8be4195
This diff is collapsed.
projects/mozilla/vlcplugin.cpp
View file @ c8be4195
......@@ -46,7 +46,10 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
b_autoplay(1),
b_toolbar(0),
psz_target(NULL),
playlist_index(-1),
libvlc_instance(NULL),
libvlc_media_list(NULL),
libvlc_media_player(NULL),
libvlc_log(NULL),
p_scriptClass(NULL),
p_browser(instance),
......@@ -190,12 +193,19 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
libvlc_exception_init(&ex);
libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, &ex);
if( libvlc_exception_raised(&ex) )
{
libvlc_exception_clear(&ex);
return NPERR_GENERIC_ERROR;
}
libvlc_media_list = libvlc_media_list_new(libvlc_instance,&ex);
if( libvlc_exception_raised(&ex) )
{
libvlc_exception_clear(&ex);
return NPERR_GENERIC_ERROR;
}
libvlc_exception_clear(&ex);
/*
** fetch plugin base URL, which is the URL of the page containing the plugin
......@@ -254,10 +264,215 @@ VlcPlugin::~VlcPlugin()
free(psz_target);
if( libvlc_log )
libvlc_log_close(libvlc_log, NULL);
if( libvlc_media_player )
libvlc_media_player_release( libvlc_media_player );
if( libvlc_media_list )
libvlc_media_list_release( libvlc_media_list );
if( libvlc_instance )
libvlc_release(libvlc_instance);
}
/*****************************************************************************
* VlcPlugin playlist replacement methods
*****************************************************************************/
void VlcPlugin::set_player_window( libvlc_exception_t *ex )
{
#ifdef XP_UNIX
libvlc_media_player_set_xwindow(libvlc_media_player,
(libvlc_drawable_t)getWindow().window,
ex);
#endif
#ifdef XP_MACOSX
// XXX FIXME insert appropriate call here
#endif
#ifdef XP_WIN
libvlc_media_player_set_hwnd(libvlc_media_player,
getWindow().window,
ex);
#endif
}
int VlcPlugin::playlist_add( const char *mrl, libvlc_exception_t *ex )
{
int item = -1;
libvlc_media_t *p_m = libvlc_media_new(libvlc_instance,mrl,ex);
if( libvlc_exception_raised(ex) )
return -1;
libvlc_media_list_lock(libvlc_media_list);
libvlc_media_list_add_media(libvlc_media_list,p_m,ex);
if( !libvlc_exception_raised(ex) )
item = libvlc_media_list_count(libvlc_media_list,ex)-1;
libvlc_media_list_unlock(libvlc_media_list);
libvlc_media_release(p_m);
return item;
}
int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *name,
int optc, const char **optv, libvlc_exception_t *ex )
{
libvlc_media_t *p_m = libvlc_media_new(libvlc_instance, mrl,ex);
int item = -1;
if( libvlc_exception_raised(ex) )
return -1;
for( int i = 0; i < optc; ++i )
{
libvlc_media_add_option_untrusted(p_m, optv[i],ex);
if( libvlc_exception_raised(ex) )
{
libvlc_media_release(p_m);
return -1;
}
}
libvlc_media_list_lock(libvlc_media_list);
libvlc_media_list_add_media(libvlc_media_list,p_m,ex);
if( !libvlc_exception_raised(ex) )
item = libvlc_media_list_count(libvlc_media_list,ex)-1;
libvlc_media_list_unlock(libvlc_media_list);
libvlc_media_release(p_m);
return item;
}
void VlcPlugin::playlist_play( libvlc_exception_t *ex )
{
if( libvlc_media_player||playlist_select(0,ex) )
libvlc_media_player_play(libvlc_media_player,ex);
}
void VlcPlugin::playlist_play_item( int idx, libvlc_exception_t *ex )
{
if( playlist_select(idx,ex) )
libvlc_media_player_play(libvlc_media_player,ex);
}
void VlcPlugin::playlist_stop( libvlc_exception_t *ex )
{
if( libvlc_media_player )
libvlc_media_player_stop(libvlc_media_player,ex);
}
bool VlcPlugin::playlist_select( int idx, libvlc_exception_t *ex )
{
libvlc_media_t *p_m = NULL;
libvlc_media_list_lock(libvlc_media_list);
int count = libvlc_media_list_count(libvlc_media_list,ex);
if( libvlc_exception_raised(ex) )
goto bad_unlock;
if( idx<0||idx>=count )
goto bad_unlock;
playlist_index = idx;
p_m = libvlc_media_list_item_at_index(libvlc_media_list,playlist_index,ex);
libvlc_media_list_unlock(libvlc_media_list);
if( libvlc_exception_raised(ex) )
return false;
if( libvlc_media_player )
{
libvlc_media_player_release( libvlc_media_player );
libvlc_media_player = NULL;
}
libvlc_media_player = libvlc_media_player_new_from_media(p_m,ex);
if( libvlc_media_player )
set_player_window(ex);
libvlc_media_release( p_m );
return !libvlc_exception_raised(ex);
bad_unlock:
libvlc_media_list_unlock(libvlc_media_list);
return false;
}
void VlcPlugin::playlist_next( libvlc_exception_t *ex )
{
if( playlist_select(playlist_index+1,ex) )
libvlc_media_player_play(libvlc_media_player,ex);
}
void VlcPlugin::playlist_prev( libvlc_exception_t *ex )
{
if( playlist_select(playlist_index-1,ex) )
libvlc_media_player_play(libvlc_media_player,ex);
}
void VlcPlugin::playlist_pause( libvlc_exception_t *ex )
{
if( libvlc_media_player )
libvlc_media_player_pause(libvlc_media_player,ex);
}
void VlcPlugin::playlist_delete_item( int idx, libvlc_exception_t *ex )
{
libvlc_media_list_lock(libvlc_media_list);
libvlc_media_list_remove_index(libvlc_media_list,idx,ex);
libvlc_media_list_unlock(libvlc_media_list);
}
void VlcPlugin::playlist_clear( libvlc_exception_t *ex )
{
if( libvlc_media_list )
libvlc_media_list_release(libvlc_media_list);
libvlc_media_list = libvlc_media_list_new(getVLC(),ex);
}
int VlcPlugin::playlist_count( libvlc_exception_t *ex )
{
int items_count = 0;
libvlc_media_list_lock(libvlc_media_list);
items_count = libvlc_media_list_count(libvlc_media_list,ex);
libvlc_media_list_unlock(libvlc_media_list);
return items_count;
}
int VlcPlugin::playlist_isplaying( libvlc_exception_t *ex )
{
int is_playing = 0;
if( libvlc_media_player )
libvlc_media_player_is_playing( libvlc_media_player, ex );
return is_playing;
}
void VlcPlugin::toggle_fullscreen( libvlc_exception_t *ex )
{
if( playlist_isplaying(ex) )
libvlc_toggle_fullscreen(libvlc_media_player,ex);
}
void VlcPlugin::set_fullscreen( int yes, libvlc_exception_t *ex )
{
if( playlist_isplaying(ex) )
libvlc_set_fullscreen(libvlc_media_player,yes,ex);
}
int VlcPlugin::get_fullscreen( libvlc_exception_t *ex )
{
int r = 0;
if( playlist_isplaying(ex) )
r = libvlc_get_fullscreen(libvlc_media_player,ex);
return r;
}
int VlcPlugin::player_has_vout( libvlc_exception_t *ex )
{
int r = 0;
if( playlist_isplaying(ex) )
r = libvlc_media_player_has_vout(libvlc_media_player, ex);
return r;
}
/*****************************************************************************
* VlcPlugin methods
*****************************************************************************/
......@@ -559,9 +774,7 @@ void VlcPlugin::hideToolbar()
void VlcPlugin::redrawToolbar()
{
libvlc_media_player_t *p_md = NULL;
libvlc_exception_t ex;
float f_position = 0.0;
int is_playing = 0;
bool b_mute = false;
unsigned int dst_x, dst_y;
......@@ -579,26 +792,7 @@ void VlcPlugin::redrawToolbar()
getToolbarSize( &i_tb_width, &i_tb_height );
/* get media instance */
libvlc_exception_init( &ex );
p_md = libvlc_playlist_get_media_player( getVLC(), &ex );
libvlc_exception_clear( &ex );
if( p_md )
{
/* get isplaying */
libvlc_playlist_lock( getVLC() );
is_playing = libvlc_playlist_isplaying( getVLC(), &ex );
libvlc_playlist_unlock( getVLC() );
libvlc_exception_clear( &ex );
/* get movie position in % */
if( is_playing == 1 )
{
f_position = libvlc_media_player_get_position( p_md, &ex ) * 100.0;
libvlc_exception_clear( &ex );
}
libvlc_media_player_release( p_md );
}
/* get mute info */
b_mute = libvlc_audio_get_mute( getVLC(), &ex );
......@@ -667,9 +861,15 @@ void VlcPlugin::redrawToolbar()
dst_y - (p_timeline->height >> 1),
(window.width-(dst_x+BTN_SPACE)), p_timeline->height );
if( f_position > 0 )
i_last_position = (int)( f_position *
( ((float)(window.width-(dst_x+BTN_SPACE))) / 100.0 ));
/* get movie position in % */
if( playlist_isplaying(&ex) )
{
i_last_position = (int)((window.width-(dst_x+BTN_SPACE))*
libvlc_media_player_get_position(libvlc_media_player,&ex));
}
libvlc_exception_clear( &ex );
if( p_btnTime )
XPutImage( p_display, control, gc, p_btnTime,
......@@ -701,9 +901,7 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos
/* get isplaying */
libvlc_exception_init( &ex );
libvlc_playlist_lock( getVLC() );
is_playing = libvlc_playlist_isplaying( getVLC(), &ex );
libvlc_playlist_unlock( getVLC() );
is_playing = playlist_isplaying( &ex );
libvlc_exception_clear( &ex );
/* get mute info */
......
projects/mozilla/vlcplugin.h
View file @ c8be4195
......@@ -88,6 +88,14 @@ public:
NPError init(int argc, char* const argn[], char* const argv[]);
libvlc_instance_t* getVLC()
{ return libvlc_instance; };
libvlc_media_player_t* getMD(libvlc_exception_t *ex)
{
if( !libvlc_media_player )
{
libvlc_exception_raise(ex,"null mediaplayer");
}
return libvlc_media_player;
}
NPP getBrowser()
{ return p_browser; };
char* getAbsoluteURL(const char *url);
......@@ -139,9 +147,37 @@ public:
int b_toolbar;
char * psz_target;
bool playlist_select(int,libvlc_exception_t *);
int playlist_add( const char *, libvlc_exception_t * );
int playlist_add_extended_untrusted( const char *, const char *, int,
const char **, libvlc_exception_t * );
void playlist_play( libvlc_exception_t * );
void playlist_play_item( int, libvlc_exception_t * );
void playlist_stop( libvlc_exception_t * );
void playlist_next( libvlc_exception_t * );
void playlist_prev( libvlc_exception_t * );
void playlist_pause( libvlc_exception_t * );
void playlist_delete_item( int, libvlc_exception_t * );
void playlist_clear( libvlc_exception_t * );
int playlist_count( libvlc_exception_t * );
int playlist_isplaying( libvlc_exception_t * );
void toggle_fullscreen( libvlc_exception_t * );
void set_fullscreen( int, libvlc_exception_t * );
int get_fullscreen( libvlc_exception_t * );
int player_has_vout( libvlc_exception_t * );
private:
void set_player_window( libvlc_exception_t * );
/* VLC reference */
int playlist_index;
libvlc_instance_t *libvlc_instance;
libvlc_media_list_t *libvlc_media_list;
libvlc_media_player_t *libvlc_media_player;
libvlc_log_t *libvlc_log;
NPClass *p_scriptClass;
......
projects/mozilla/vlcshell.cpp
View file @ c8be4195
......@@ -157,6 +157,8 @@ NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value )
int16 NPP_HandleEvent( NPP instance, void * event )
{
static UInt32 lastMouseUp = 0;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
if( instance == NULL )
{
......@@ -181,24 +183,8 @@ int16 NPP_HandleEvent( NPP instance, void * event )
if( (myEvent->when - lastMouseUp) < GetDblTime() )
{
/* double click */
libvlc_instance_t *p_vlc = p_plugin->getVLC();
if( p_vlc )
{
int is_playing;
libvlc_playlist_lock(p_vlc);
is_playing = libvlc_playlist_isplaying(p_vlc, NULL);
libvlc_playlist_unlock(p_vlc);
if( is_playing )
{
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_vlc, NULL);
if( p_md )
{
libvlc_toggle_fullscreen(p_md, NULL);
libvlc_media_player_release(p_md);
}
}
}
p_plugin->toggle_fullscreen(&ex);
libvlc_exception_clear(&ex);
}
return true;
}
......@@ -215,36 +201,21 @@ int16 NPP_HandleEvent( NPP instance, void * event )
if( npwindow.window )
{
int hasVout = FALSE;
libvlc_instance_t *p_vlc = p_plugin->getVLC();
if( p_vlc )
if( p_plugin->playlist_isplaying(&ex) )
{
int is_playing;
libvlc_playlist_lock(p_vlc);
is_playing = libvlc_playlist_isplaying(p_vlc, NULL);
libvlc_playlist_unlock(p_vlc);
if( is_playing )
hasVout = p_plugin->player_has_vout(NULL);
if( hasVout )
{
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_vlc, NULL);
if( p_md )
{
hasVout = libvlc_media_player_has_vout(p_md,
NULL);
if( hasVout )
{
libvlc_rectangle_t area;
area.left = 0;
area.top = 0;
area.right = npwindow.width;
area.bottom = npwindow.height;
libvlc_video_redraw_rectangle(p_md, &area,
NULL);
}
libvlc_media_player_release(p_md);
}
libvlc_rectangle_t area;
area.left = 0;
area.top = 0;
area.right = npwindow.width;
area.bottom = npwindow.height;
libvlc_video_redraw_rectangle(p_md, &area, NULL);
}
}
libvlc_exception_clear(&ex);
if( ! hasVout )
{
......@@ -548,8 +519,8 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
libvlc_exception_t ex;
libvlc_exception_init(& ex );
p_md = libvlc_playlist_get_media_player( p_plugin->getVLC(), &ex );
libvlc_exception_init( &ex );
p_md = p_plugin->getMD( &ex );
libvlc_exception_clear( &ex );
libvlc_event_attach( libvlc_media_player_event_manager( p_md, &ex ),
libvlc_MediaPlayerPositionChanged, Redraw, NULL, &ex );
*/
......@@ -583,12 +554,11 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
if( p_plugin->psz_target )
{
if( libvlc_playlist_add( p_vlc, p_plugin->psz_target,
NULL, NULL ) != -1 )
if( p_plugin->playlist_add( p_plugin->psz_target, NULL ) != -1 )
{
if( p_plugin->b_autoplay )
{
libvlc_playlist_play(p_vlc, 0, 0, NULL, NULL);
p_plugin->playlist_play(NULL);
}
}
p_plugin->b_stream = true;
......@@ -665,12 +635,11 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
return;
}
if( libvlc_playlist_add( p_plugin->getVLC(), fname, stream->url, NULL )
!= -1 )
if( p_plugin->playlist_add( stream->url, NULL ) != -1 )
{
if( p_plugin->b_autoplay )
{
libvlc_playlist_play( p_plugin->getVLC(), 0, 0, NULL, NULL);
p_plugin->playlist_play(NULL);
}
}
}
......@@ -848,15 +817,12 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
libvlc_exception_t ex;
libvlc_exception_init( &ex );
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
libvlc_media_player_t *p_md = p_plugin->getMD(&ex);
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
libvlc_playlist_lock( p_plugin->getVLC() );
i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
libvlc_playlist_unlock( p_plugin->getVLC() );
i_playing = p_plugin->playlist_isplaying( &ex );
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
......@@ -869,9 +835,9 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
case clicked_Pause:
{
if( i_playing == 1 )
libvlc_playlist_pause( p_plugin->getVLC(), &ex );
p_plugin->playlist_pause( &ex );
else
libvlc_playlist_play( p_plugin->getVLC(), -1, 0, NULL, &ex );
p_plugin->playlist_play( &ex );
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
......@@ -881,7 +847,7 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
case clicked_Stop:
{
libvlc_playlist_stop( p_plugin->getVLC(), &ex );
p_plugin->playlist_stop(&ex);
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
......@@ -890,13 +856,10 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
case clicked_Fullscreen:
{
if( (i_playing == 1) && p_md )
{
libvlc_set_fullscreen( p_md, 1, &ex );
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
}
p_plugin->set_fullscreen( 1, &ex );
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
}
break;
......@@ -939,7 +902,6 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
default: /* button_Unknown */
break;
}
if( p_md ) libvlc_media_player_release( p_md );
}
Redraw( w, closure, event );
}
......
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