/*****************************************************************************
* 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 "control/npolibvlc.h"
#include <ctype.h>
-#include <pthread.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
+}
/*****************************************************************************
* 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),
!strcasecmp(value, "yes") );
}
+bool EventObj::init()
+{
+ plugin_lock_init(&lock);
+ return true;
+}
+
+EventObj::~EventObj()
+{
+ plugin_lock_destroy(&lock);
+}
void EventObj::deliver(NPP browser)
{
NPVariant result;
NPVariant params[1];
- pthread_mutex_lock(&mutex);
+ plugin_lock(&lock);
for( ev_l::iterator i=_elist.begin();i!=_elist.end();++i )
{
}
_elist.clear();
- pthread_mutex_unlock(&mutex);
+ plugin_unlock(&lock);
}
void VlcPlugin::eventAsync(void *param)
void EventObj::callback(const libvlc_event_t* event)
{
- pthread_mutex_lock(&mutex);
+ plugin_lock(&lock);
if( have_event(event->type) )
_elist.push_back(event->type);
- pthread_mutex_unlock(&mutex);
+ plugin_unlock(&lock);
}
void VlcPlugin::event_callback(const libvlc_event_t* event, void *param)
{
VlcPlugin *plugin = (VlcPlugin*)param;
-#ifdef XP_UNIX
+#if defined(XP_UNIX)
plugin->events.callback(event);
NPN_PluginThreadAsyncCall(plugin->getBrowser(), eventAsync, plugin);
#else
#warning NPN_PluginThreadAsyncCall not implemented yet.
- printf("%s","No NPN_PluginThreadAsyncCall(), doing nothing.");
+ printf("No NPN_PluginThreadAsyncCall(), doing nothing.");
#endif
}
bool EventObj::insert(const NPString &s, NPObject *l, bool b)
{
- event_t e = find_event(s.utf8characters);
+ event_t e = find_event(s.UTF8Characters);
if( e>=maxbit() )
return false;
return false;
i->get(e);
}
+ return true;
}
bool EventObj::remove(const NPString &s, NPObject *l, bool b)
{
- event_t e = find_event(s.utf8characters);
+ event_t e = find_event(s.UTF8Characters);
if( e>=maxbit() || !get(e) )
return false;
}
if(!any)
unask_for_event(e);
+
+ return true;
}
}
}
- 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);
/*
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 = (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);
if( libvlc_media_player )
{
+ if( playlist_isplaying() )
+ playlist_stop();
events.unhook_manager();
libvlc_media_player_release( libvlc_media_player );
}
{
#ifdef XP_UNIX
libvlc_media_player_set_xwindow(libvlc_media_player,
- (libvlc_drawable_t)getVideoWindow());
+ (uint32_t)getVideoWindow());
#endif
#ifdef XP_MACOSX
// XXX FIXME insert appropriate call here
#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) )
+ 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);
}
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_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) )
+ 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;
+ 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;
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();
libvlc_media_player_release( libvlc_media_player );
libvlc_media_player = NULL;
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);
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);
return items_count;
}
-void VlcPlugin::toggle_fullscreen( libvlc_exception_t *ex )
+void VlcPlugin::toggle_fullscreen()
{
if( playlist_isplaying() )
- libvlc_toggle_fullscreen(libvlc_media_player,ex);
+ 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() )
- libvlc_set_fullscreen(libvlc_media_player,yes,ex);
+ 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() )
- r = libvlc_get_fullscreen(libvlc_media_player,ex);
+ r = libvlc_get_fullscreen(libvlc_media_player);
return r;
}
-bool VlcPlugin::player_has_vout( libvlc_exception_t *ex )
+bool VlcPlugin::player_has_vout()
{
bool r = false;
if( playlist_isplaying() )
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;
}
-
projects / vlc / blobdiff