/*****************************************************************************
* 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>
*****************************************************************************/
#include "config.h"
-#ifdef HAVE_MOZILLA_CONFIG_H
-# include <mozilla-config.h>
-#endif
-
#include "vlcplugin.h"
+
#include "control/npolibvlc.h"
#include <ctype.h>
+#if defined(XP_UNIX)
+# include <pthread.h>
+#elif defined(XP_WIN)
+ /* windows headers */
+# include <winbase.h>
+#else
+#warning "locking not implemented for this platform"
+#endif
+
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+
+/*****************************************************************************
+ * utilitiy functions
+ *****************************************************************************/
+static void plugin_lock_init(plugin_lock_t *lock)
+{
+ assert(lock);
+
+#if defined(XP_UNIX)
+ pthread_mutex_init(&lock->mutex, NULL);
+#elif defined(XP_WIN)
+ InitializeCriticalSection(&lock->cs);
+#else
+#warning "locking not implemented in this platform"
+#endif
+}
+
+static void plugin_lock_destroy(plugin_lock_t *lock)
+{
+ assert(lock);
+
+#if defined(XP_UNIX)
+ pthread_mutex_destroy(&lock->mutex);
+#elif defined(XP_WIN)
+ DeleteCriticalSection(&lock->cs);
+#else
+#warning "locking not implemented in this platform"
+#endif
+}
+
+static void plugin_lock(plugin_lock_t *lock)
+{
+ assert(lock);
+
+#if defined(XP_UNIX)
+ pthread_mutex_lock(&lock->mutex);
+#elif defined(XP_WIN)
+ EnterCriticalSection(&lock->cs);
+#else
+#warning "locking not implemented in this platform"
+#endif
+}
+
+static void plugin_unlock(plugin_lock_t *lock)
+{
+ assert(lock);
+
+#if defined(XP_UNIX)
+ pthread_mutex_unlock(&lock->mutex);
+#elif defined(XP_WIN)
+ LeaveCriticalSection(&lock->cs);
+#else
+#warning "locking not implemented in this platform"
+#endif
+}
+
+/*****************************************************************************
+ * Event Object
+ *****************************************************************************/
+static void handle_input_event(const libvlc_event_t* event, void *param);
+static void handle_changed_event(const libvlc_event_t* event, void *param);
+
+static vlcplugin_event_t vlcevents[] = {
+ { "MediaPlayerMediaChanged", libvlc_MediaPlayerMediaChanged, handle_input_event },
+ { "MediaPlayerNothingSpecial", libvlc_MediaPlayerNothingSpecial, handle_input_event },
+ { "MediaPlayerOpening", libvlc_MediaPlayerOpening, handle_input_event },
+ { "MediaPlayerBuffering", libvlc_MediaPlayerBuffering, handle_changed_event },
+ { "MediaPlayerPlaying", libvlc_MediaPlayerPlaying, handle_input_event },
+ { "MediaPlayerPaused", libvlc_MediaPlayerPaused, handle_input_event },
+ { "MediaPlayerStopped", libvlc_MediaPlayerStopped, handle_input_event },
+ { "MediaPlayerForward", libvlc_MediaPlayerForward, handle_input_event },
+ { "MediaPlayerBackward", libvlc_MediaPlayerBackward, handle_input_event },
+ { "MediaPlayerEndReached", libvlc_MediaPlayerEndReached, handle_input_event },
+ { "MediaPlayerEncounteredError", libvlc_MediaPlayerEncounteredError, handle_input_event },
+ { "MediaPlayerTimeChanged", libvlc_MediaPlayerTimeChanged, handle_changed_event },
+ { "MediaPlayerPositionChanged", libvlc_MediaPlayerPositionChanged, handle_changed_event },
+ { "MediaPlayerSeekableChanged", libvlc_MediaPlayerSeekableChanged, handle_changed_event },
+ { "MediaPlayerPausableChanged", libvlc_MediaPlayerPausableChanged, handle_changed_event },
+ { "MediaPlayerTitleChanged", libvlc_MediaPlayerTitleChanged, handle_changed_event },
+ { "MediaPlayerLengthChanged", libvlc_MediaPlayerLengthChanged, handle_changed_event },
+};
+
+static void handle_input_event(const libvlc_event_t* event, void *param)
+{
+ VlcPlugin *plugin = (VlcPlugin*)param;
+ switch( event->type )
+ {
+ case libvlc_MediaPlayerNothingSpecial:
+ case libvlc_MediaPlayerOpening:
+ case libvlc_MediaPlayerPlaying:
+ case libvlc_MediaPlayerPaused:
+ case libvlc_MediaPlayerStopped:
+ case libvlc_MediaPlayerForward:
+ case libvlc_MediaPlayerBackward:
+ case libvlc_MediaPlayerEndReached:
+ case libvlc_MediaPlayerEncounteredError:
+ plugin->event_callback(event, NULL, 0, param);
+ break;
+ default: /* ignore all other libvlc_event_type_t */
+ break;
+ }
+}
+
+static void handle_changed_event(const libvlc_event_t* event, void *param)
+{
+ uint32_t npcount = 1;
+ NPVariant *npparam = (NPVariant *) NPN_MemAlloc( sizeof(NPVariant) * npcount );
+
+ VlcPlugin *plugin = (VlcPlugin*)param;
+ switch( event->type )
+ {
+ case libvlc_MediaPlayerBuffering:
+ DOUBLE_TO_NPVARIANT(event->u.media_player_buffering.new_cache, npparam[0]);
+ break;
+ case libvlc_MediaPlayerTimeChanged:
+ DOUBLE_TO_NPVARIANT(event->u.media_player_time_changed.new_time, npparam[0]);
+ break;
+ case libvlc_MediaPlayerPositionChanged:
+ DOUBLE_TO_NPVARIANT(event->u.media_player_position_changed.new_position, npparam[0]);
+ break;
+ case libvlc_MediaPlayerSeekableChanged:
+ BOOLEAN_TO_NPVARIANT(event->u.media_player_seekable_changed.new_seekable, npparam[0]);
+ break;
+ case libvlc_MediaPlayerPausableChanged:
+ BOOLEAN_TO_NPVARIANT(event->u.media_player_pausable_changed.new_pausable, npparam[0]);
+ break;
+ case libvlc_MediaPlayerTitleChanged:
+ BOOLEAN_TO_NPVARIANT(event->u.media_player_title_changed.new_title, npparam[0]);
+ break;
+ case libvlc_MediaPlayerLengthChanged:
+ DOUBLE_TO_NPVARIANT(event->u.media_player_length_changed.new_length, npparam[0]);
+ break;
+ default: /* ignore all other libvlc_event_type_t */
+ NPN_MemFree( npparam );
+ return;
+ }
+ plugin->event_callback(event, npparam, npcount, param);
+}
+
+bool EventObj::init()
+{
+ plugin_lock_init(&lock);
+ return true;
+}
+
+EventObj::~EventObj()
+{
+ plugin_lock_destroy(&lock);
+}
+
+void EventObj::deliver(NPP browser)
+{
+ plugin_lock(&lock);
+
+ for( ev_l::iterator iter = _elist.begin(); iter != _elist.end(); ++iter )
+ {
+ for( lr_l::iterator j = _llist.begin(); j != _llist.end(); ++j )
+ {
+ if( j->event_type() == iter->event_type() )
+ {
+ NPVariant result;
+ NPVariant *params = iter->params();
+ uint32_t count = iter->count();
+
+ NPObject *listener = j->listener();
+ assert( listener );
+
+ NPN_InvokeDefault( browser, listener, params, count, &result );
+ NPN_ReleaseVariantValue( &result );
+
+ for( uint32_t n = 0; n < count; n++ )
+ {
+ if( NPVARIANT_IS_STRING(params[n]) )
+ NPN_MemFree( (void*) NPVARIANT_TO_STRING(params[n]).UTF8Characters );
+ else if( NPVARIANT_IS_OBJECT(params[n]) )
+ {
+ NPN_ReleaseObject( NPVARIANT_TO_OBJECT(params[n]) );
+ NPN_MemFree( (void*)NPVARIANT_TO_OBJECT(params[n]) );
+ }
+ }
+ if (params) NPN_MemFree( params );
+ }
+ }
+ }
+ _elist.clear();
+
+ plugin_unlock(&lock);
+}
+
+void EventObj::callback(const libvlc_event_t* event,
+ NPVariant *npparams, uint32_t count)
+{
+ plugin_lock(&lock);
+ _elist.push_back(VLCEvent(event->type, npparams, count));
+ plugin_unlock(&lock);
+}
+
+vlcplugin_event_t *EventObj::find_event(const char *s) const
+{
+ for( int i = 0; i < ARRAY_SIZE(vlcevents); i++ )
+ {
+ if( strncmp(vlcevents[i].name, s, strlen(vlcevents[i].name)) == 0 )
+ return &vlcevents[i];
+ }
+ return NULL;
+}
+
+const char *EventObj::find_name(const libvlc_event_t *event)
+{
+ for( int i = 0; i < ARRAY_SIZE(vlcevents); i++ )
+ {
+ if( vlcevents[i].libvlc_type == event->type )
+ return vlcevents[i].name;
+ }
+ return NULL;
+}
+
+bool EventObj::insert(const NPString &name, NPObject *listener, bool bubble)
+{
+ vlcplugin_event_t *event = find_event(name.UTF8Characters);
+ if( !event )
+ return false;
+
+ lr_l::iterator iter;
+ for( iter = _llist.begin(); iter != _llist.end(); ++iter )
+ if( iter->listener() == listener && iter->bubble() == bubble )
+ break;
+
+ if( iter == _llist.end() )
+ {
+ _llist.push_back(Listener(event, listener, bubble));
+ return true;
+ }
+
+ return false;
+}
+
+bool EventObj::remove(const NPString &name, NPObject *listener, bool bubble)
+{
+ vlcplugin_event_t *event = find_event(name.UTF8Characters);
+ if( !event )
+ return false;
+
+ for( lr_l::iterator iter = _llist.begin(); iter !=_llist.end(); iter++ )
+ {
+ if( iter->event_type() == event->libvlc_type &&
+ iter->listener() == listener &&
+ iter->bubble() == bubble )
+ {
+ iter = _llist.erase(iter);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+void EventObj::hook_manager( libvlc_event_manager_t *em, void *userdata )
+{
+ _em = em;
+
+ if( _em )
+ {
+ /* attach all libvlc events we care about */
+ for( int i = 0; i < ARRAY_SIZE(vlcevents); i++ )
+ {
+ libvlc_event_attach( _em, vlcevents[i].libvlc_type,
+ vlcevents[i].libvlc_callback,
+ userdata );
+ }
+ }
+}
+
+void EventObj::unhook_manager( void *userdata )
+{
+ if( _em )
+ {
+ /* detach all libvlc events we cared about */
+ for( int i = 0; i < ARRAY_SIZE(vlcevents); i++ )
+ {
+ libvlc_event_detach( _em, vlcevents[i].libvlc_type,
+ vlcevents[i].libvlc_callback,
+ userdata );
+ }
+ }
+}
+
/*****************************************************************************
* VlcPlugin constructor and destructor
*****************************************************************************/
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
+#else
+VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
+#endif
i_npmode(mode),
b_stream(0),
b_autoplay(1),
b_toolbar(0),
+ psz_text(NULL),
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),
psz_baseURL(NULL)
-#if XP_WIN
+#if defined(XP_WIN)
,pf_wndproc(NULL)
#endif
-#if XP_UNIX
+#if defined(XP_UNIX)
,i_width((unsigned)-1)
,i_height((unsigned)-1)
,i_tb_width(0)
#endif
{
memset(&npwindow, 0, sizeof(NPWindow));
-#if XP_UNIX
+#if defined(XP_UNIX)
memset(&npvideo, 0, sizeof(Window));
memset(&npcontrol, 0, sizeof(Window));
#endif
!strcasecmp(value, "yes") );
}
+void VlcPlugin::eventAsync(void *param)
+{
+ VlcPlugin *plugin = (VlcPlugin*)param;
+ plugin->events.deliver(plugin->getBrowser());
+}
+
+void VlcPlugin::event_callback(const libvlc_event_t* event,
+ NPVariant *npparams, uint32_t npcount, void *userdata)
+{
+ VlcPlugin *plugin = (VlcPlugin*)userdata;
+#if defined(XP_UNIX)
+ plugin->events.callback(event, npparams, npcount);
+ NPN_PluginThreadAsyncCall(plugin->getBrowser(), eventAsync, plugin);
+#else
+#warning NPN_PluginThreadAsyncCall not implemented yet.
+ printf("No NPN_PluginThreadAsyncCall(), doing nothing.\n");
+#endif
+}
+
NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
{
/* prepare VLC command line */
/* locate VLC module path */
#ifdef XP_MACOSX
- ppsz_argv[ppsz_argc++] = "--plugin-path=/Library/Internet\\ Plug-Ins/VLC\\ Plugin.plugin/Contents/MacOS/modules";
- ppsz_argv[ppsz_argc++] = "--vout=macosx";
+ ppsz_argv[ppsz_argc++] = "--plugin-path=/Library/Internet\\ Plug-Ins/VLC\\ Plugin.plugin/Contents/MacOS/plugins";
+ ppsz_argv[ppsz_argc++] = "--vout=minimal_macosx";
#elif defined(XP_WIN)
HKEY h_key;
DWORD i_type, i_data = MAX_PATH + 1;
ppsz_argv[ppsz_argc++] = "-vv";
ppsz_argv[ppsz_argc++] = "--no-stats";
ppsz_argv[ppsz_argc++] = "--no-media-library";
- ppsz_argv[ppsz_argc++] = "--ignore-config";
ppsz_argv[ppsz_argc++] = "--intf=dummy";
ppsz_argv[ppsz_argc++] = "--no-video-title-show";
+ ppsz_argv[ppsz_argc++] = "--no-xlib";
const char *progid = NULL;
/* parse plugin arguments */
- for( int i = 0; i < argc ; i++ )
+ for( int i = 0; (i < argc) && (ppsz_argc < 32); i++ )
{
/* fprintf(stderr, "argn=%s, argv=%s\n", argn[i], argv[i]); */
{
psz_target = argv[i];
}
+ else if( !strcmp( argn[i], "text" ) )
+ {
+ free( psz_text );
+ psz_text = strdup( argv[i] );
+ }
else if( !strcmp( argn[i], "autoplay")
|| !strcmp( argn[i], "autostart") )
{
}
}
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- libvlc_exception_clear(&ex);
+ libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv);
+ if( !libvlc_instance )
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_media_list = libvlc_media_list_new(libvlc_instance);
/*
** fetch plugin base URL, which is the URL of the page containing the plugin
** this URL is used for making absolute URL from relative URL that may be
** passed as an MRL argument
*/
- NPObject *plugin;
+ NPObject *plugin = NULL;
if( NPERR_NO_ERROR == NPN_GetValue(p_browser, NPNVWindowNPObject, &plugin) )
{
NPString script;
NPVariant result;
- script.utf8characters = docLocHref;
- script.utf8length = sizeof(docLocHref)-1;
+ script.UTF8Characters = docLocHref;
+ script.UTF8Length = sizeof(docLocHref)-1;
if( NPN_Evaluate(p_browser, plugin, &script, &result) )
{
{
NPString &location = NPVARIANT_TO_STRING(result);
- psz_baseURL = static_cast<char*>(malloc(location.utf8length+1));
+ psz_baseURL = (char *) malloc(location.UTF8Length+1);
if( psz_baseURL )
{
- strncpy(psz_baseURL, location.utf8characters, location.utf8length);
- psz_baseURL[location.utf8length] = '\0';
+ strncpy(psz_baseURL, location.UTF8Characters, location.UTF8Length);
+ psz_baseURL[location.UTF8Length] = '\0';
}
}
NPN_ReleaseVariantValue(&result);
/* new APIs */
p_scriptClass = RuntimeNPClass<LibvlcRootNPObject>::getClass();
+ if( !events.init() )
+ return NPERR_GENERIC_ERROR;
+
return NPERR_NO_ERROR;
}
{
free(psz_baseURL);
free(psz_target);
- if( libvlc_log )
- libvlc_log_close(libvlc_log, NULL);
+ free(psz_text);
+
if( libvlc_media_player )
+ {
+ if( playlist_isplaying() )
+ playlist_stop();
+ events.unhook_manager( this );
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);
+ libvlc_release( libvlc_instance );
}
/*****************************************************************************
* VlcPlugin playlist replacement methods
*****************************************************************************/
-void VlcPlugin::set_player_window( libvlc_exception_t *ex )
+void VlcPlugin::set_player_window()
{
#ifdef XP_UNIX
libvlc_media_player_set_xwindow(libvlc_media_player,
- (libvlc_drawable_t)getVideoWindow(),
- ex);
+ (uint32_t)getVideoWindow());
#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);
+ getWindow().window);
#endif
}
-int VlcPlugin::playlist_add( const char *mrl, libvlc_exception_t *ex )
+int VlcPlugin::playlist_add( const char *mrl )
{
int item = -1;
- libvlc_media_t *p_m = libvlc_media_new(libvlc_instance,mrl,ex);
- if( libvlc_exception_raised(ex) )
+ libvlc_media_t *p_m = libvlc_media_new_location(libvlc_instance,mrl);
+ if( !p_m )
return -1;
-
+ assert( libvlc_media_list );
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;
+ if( !libvlc_media_list_add_media(libvlc_media_list,p_m) )
+ item = libvlc_media_list_count(libvlc_media_list)-1;
libvlc_media_list_unlock(libvlc_media_list);
libvlc_media_release(p_m);
}
int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *name,
- int optc, const char **optv, libvlc_exception_t *ex )
+ int optc, const char **optv )
{
- libvlc_media_t *p_m = libvlc_media_new(libvlc_instance, mrl,ex);
+ libvlc_media_t *p_m;
int item = -1;
- if( libvlc_exception_raised(ex) )
+
+ assert( libvlc_media_list );
+
+ p_m = libvlc_media_new_location(libvlc_instance, mrl);
+ if( !p_m )
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_add_option_flag(p_m, optv[i], libvlc_media_option_unique);
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;
+ if( !libvlc_media_list_add_media(libvlc_media_list,p_m) )
+ item = libvlc_media_list_count(libvlc_media_list)-1;
libvlc_media_list_unlock(libvlc_media_list);
libvlc_media_release(p_m);
return item;
}
-bool VlcPlugin::playlist_select( int idx, libvlc_exception_t *ex )
+bool VlcPlugin::playlist_select( int idx )
{
libvlc_media_t *p_m = NULL;
- libvlc_media_list_lock(libvlc_media_list);
+ assert( libvlc_media_list );
- int count = libvlc_media_list_count(libvlc_media_list,ex);
- if( libvlc_exception_raised(ex) )
- goto bad_unlock;
+ libvlc_media_list_lock(libvlc_media_list);
+ int count = libvlc_media_list_count(libvlc_media_list);
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);
+ p_m = libvlc_media_list_item_at_index(libvlc_media_list,playlist_index);
libvlc_media_list_unlock(libvlc_media_list);
- if( libvlc_exception_raised(ex) )
+ if( !p_m )
return false;
if( libvlc_media_player )
{
+ if( playlist_isplaying() )
+ playlist_stop();
+ events.unhook_manager( this );
libvlc_media_player_release( libvlc_media_player );
libvlc_media_player = NULL;
}
- libvlc_media_player = libvlc_media_player_new_from_media(p_m,ex);
+ libvlc_media_player = libvlc_media_player_new_from_media( p_m );
if( libvlc_media_player )
- set_player_window(ex);
+ {
+ set_player_window();
+
+ libvlc_event_manager_t *p_em;
+ p_em = libvlc_media_player_event_manager( libvlc_media_player );
+ events.hook_manager( p_em, this );
+ }
libvlc_media_release( p_m );
- return !libvlc_exception_raised(ex);
+ return true;
bad_unlock:
- libvlc_media_list_unlock(libvlc_media_list);
+ libvlc_media_list_unlock( libvlc_media_list );
return false;
}
-void VlcPlugin::playlist_delete_item( int idx, libvlc_exception_t *ex )
+int VlcPlugin::playlist_delete_item( int idx )
{
+ if( !libvlc_media_list )
+ return -1;
libvlc_media_list_lock(libvlc_media_list);
- libvlc_media_list_remove_index(libvlc_media_list,idx,ex);
+ int ret = libvlc_media_list_remove_index(libvlc_media_list,idx);
libvlc_media_list_unlock(libvlc_media_list);
+ return ret;
}
-void VlcPlugin::playlist_clear( libvlc_exception_t *ex )
+void VlcPlugin::playlist_clear()
{
if( libvlc_media_list )
libvlc_media_list_release(libvlc_media_list);
- libvlc_media_list = libvlc_media_list_new(getVLC(),ex);
+ libvlc_media_list = libvlc_media_list_new(getVLC());
}
-int VlcPlugin::playlist_count( libvlc_exception_t *ex )
+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,ex);
+ items_count = libvlc_media_list_count(libvlc_media_list);
libvlc_media_list_unlock(libvlc_media_list);
return items_count;
}
-void VlcPlugin::toggle_fullscreen( libvlc_exception_t *ex )
+void VlcPlugin::toggle_fullscreen()
{
- if( playlist_isplaying(ex) )
- libvlc_toggle_fullscreen(libvlc_media_player,ex);
+ if( playlist_isplaying() )
+ libvlc_toggle_fullscreen(libvlc_media_player);
}
-void VlcPlugin::set_fullscreen( int yes, libvlc_exception_t *ex )
+
+void VlcPlugin::set_fullscreen( int yes )
{
- if( playlist_isplaying(ex) )
- libvlc_set_fullscreen(libvlc_media_player,yes,ex);
+ if( playlist_isplaying() )
+ libvlc_set_fullscreen(libvlc_media_player,yes);
}
-int VlcPlugin::get_fullscreen( libvlc_exception_t *ex )
+
+int VlcPlugin::get_fullscreen()
{
int r = 0;
- if( playlist_isplaying(ex) )
- r = libvlc_get_fullscreen(libvlc_media_player,ex);
+ if( playlist_isplaying() )
+ r = libvlc_get_fullscreen(libvlc_media_player);
return r;
}
-int VlcPlugin::player_has_vout( libvlc_exception_t *ex )
+bool VlcPlugin::player_has_vout()
{
- int r = 0;
- if( playlist_isplaying(ex) )
- r = libvlc_media_player_has_vout(libvlc_media_player, ex);
+ bool r = false;
+ if( playlist_isplaying() )
+ r = libvlc_media_player_has_vout(libvlc_media_player);
return r;
}
if( psz_baseURL )
{
size_t baseLen = strlen(psz_baseURL);
- char *href = static_cast<char*>(malloc(baseLen+strlen(url)+1));
+ char *href = (char *) malloc(baseLen+strlen(url)+1);
if( href )
{
/* prepend base URL */
- strcpy(href, psz_baseURL);
+ memcpy(href, psz_baseURL, baseLen+1);
/*
** relative url could be empty,
/* skip over protocol part */
char *pathstart = strchr(href, ':');
- char *pathend;
+ char *pathend = href+baseLen;
if( pathstart )
{
if( '/' == *(++pathstart) )
}
/* skip over host part */
pathstart = strchr(pathstart, '/');
- pathend = href+baseLen;
if( ! pathstart )
{
// no path, add a / past end of url (over '\0')
if( '/' != *href )
{
/* baseURL is not an absolute path */
- free(href);
+ free(href);
return NULL;
}
pathstart = href;
- pathend = href+baseLen;
}
/* relative URL made of an absolute path ? */
return NULL;
}
-#if XP_UNIX
+#if defined(XP_UNIX)
int VlcPlugin::setSize(unsigned width, unsigned height)
{
int diff = (width != i_width) || (height != i_height);
void VlcPlugin::redrawToolbar()
{
- libvlc_exception_t ex;
int is_playing = 0;
bool b_mute = false;
unsigned int dst_x, dst_y;
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 );
- libvlc_exception_init( &ex );
-
/* get mute info */
- b_mute = libvlc_audio_get_mute( getVLC(), &ex );
- libvlc_exception_clear( &ex );
+ b_mute = libvlc_audio_get_mute( libvlc_media_player );
gcv.foreground = BlackPixel( p_display, 0 );
gc = XCreateGC( p_display, control, GCForeground, &gcv );
(window.width-(dst_x+BTN_SPACE)), p_timeline->height );
/* get movie position in % */
- if( playlist_isplaying(&ex) )
+ if( playlist_isplaying() )
{
i_last_position = (int)((window.width-(dst_x+BTN_SPACE))*
- libvlc_media_player_get_position(libvlc_media_player,&ex));
+ libvlc_media_player_get_position(libvlc_media_player));
}
- libvlc_exception_clear( &ex );
if( p_btnTime )
XPutImage( p_display, control, gc, p_btnTime,
unsigned int i_dest = BTN_SPACE;
int is_playing = 0;
bool b_mute = false;
- libvlc_exception_t ex;
#ifndef NDEBUG
fprintf( stderr, "ToolbarButtonClicked:: "
*/
/* get isplaying */
- libvlc_exception_init( &ex );
- is_playing = playlist_isplaying( &ex );
- libvlc_exception_clear( &ex );
+ is_playing = playlist_isplaying();
/* get mute info */
- b_mute = libvlc_audio_get_mute( getVLC(), &ex );
- libvlc_exception_clear( &ex );
+ if( libvlc_media_player )
+ b_mute = libvlc_audio_get_mute( libvlc_media_player );
/* is Pause of Play button clicked */
if( (is_playing != 1) &&
}
#undef BTN_SPACE
#endif
+
+// Verifies the version of the NPAPI.
+// The eventListeners use a NPAPI function available
+// since Gecko 1.9.
+bool VlcPlugin::canUseEventListener()
+{
+ int plugin_major, plugin_minor;
+ int browser_major, browser_minor;
+
+ NPN_Version(&plugin_major, &plugin_minor,
+ &browser_major, &browser_minor);
+
+ if (browser_minor >= 19 || browser_major > 0)
+ return true;
+ return false;
+}
projects / vlc / blobdiff