*****************************************************************************/
#include "config.h"
-#ifdef HAVE_MOZILLA_CONFIG_H
-# include <mozilla-config.h>
-#endif
-
#include "vlcplugin.h"
#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;
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;
/* 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++] = "--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;
ppsz_argv[ppsz_argc++] = "--no-media-library";
ppsz_argv[ppsz_argc++] = "--intf=dummy";
ppsz_argv[ppsz_argc++] = "--no-video-title-show";
+ ppsz_argv[ppsz_argc++] = "--no-xlib";
const char *progid = NULL;
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 );
}