/*****************************************************************************
* vlcplugin.cpp: a VLC plugin for Mozilla
*****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2010 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
libvlc_media_t *p_m = libvlc_media_new(libvlc_instance,mrl);
if( !p_m )
return -1;
-
+ assert( libvlc_media_list );
libvlc_media_list_lock(libvlc_media_list);
if( !libvlc_media_list_add_media(libvlc_media_list,p_m) )
item = libvlc_media_list_count(libvlc_media_list)-1;
int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *name,
int optc, const char **optv )
{
- libvlc_media_t *p_m = libvlc_media_new(libvlc_instance, mrl);
+ libvlc_media_t *p_m;
int item = -1;
+
+ assert( libvlc_media_list );
+
+ p_m = libvlc_media_new(libvlc_instance, mrl);
if( !p_m )
return -1;
{
libvlc_media_t *p_m = NULL;
+ assert( libvlc_media_list );
+
libvlc_media_list_lock(libvlc_media_list);
int count = libvlc_media_list_count(libvlc_media_list);
-
if( idx<0||idx>=count )
goto bad_unlock;
if( libvlc_media_player )
{
+ if( playlist_isplaying() )
+ playlist_stop();
events.unhook_manager();
libvlc_media_player_release( libvlc_media_player );
libvlc_media_player = NULL;
int VlcPlugin::playlist_delete_item( int idx )
{
+ if( !libvlc_media_list )
+ return -1;
libvlc_media_list_lock(libvlc_media_list);
int ret = libvlc_media_list_remove_index(libvlc_media_list,idx);
libvlc_media_list_unlock(libvlc_media_list);
int VlcPlugin::playlist_count()
{
int items_count = 0;
+ if( !libvlc_media_list )
+ return items_count;
libvlc_media_list_lock(libvlc_media_list);
items_count = libvlc_media_list_count(libvlc_media_list);
libvlc_media_list_unlock(libvlc_media_list);
if( playlist_isplaying() )
libvlc_toggle_fullscreen(libvlc_media_player);
}
-void VlcPlugin::set_fullscreen( int yes)
+
+void VlcPlugin::set_fullscreen( int yes )
{
if( playlist_isplaying() )
libvlc_set_fullscreen(libvlc_media_player,yes);
}
+
int VlcPlugin::get_fullscreen()
{
int r = 0;
unsigned int i_tb_width, i_tb_height;
/* This method does nothing if toolbar is hidden. */
- if( !b_toolbar )
+ if( !b_toolbar || !libvlc_media_player )
return;
const NPWindow& window = getWindow();
getToolbarSize( &i_tb_width, &i_tb_height );
-
/* get mute info */
b_mute = libvlc_audio_get_mute( libvlc_media_player );
is_playing = playlist_isplaying();
/* get mute info */
- b_mute = libvlc_audio_get_mute( libvlc_media_player );
+ if( libvlc_media_player )
+ b_mute = libvlc_audio_get_mute( libvlc_media_player );
/* is Pause of Play button clicked */
if( (is_playing != 1) &&
return true;
return false;
}
-