X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=projects%2Fmozilla%2Fvlcplugin.cpp;h=aa5010135cd18bf231aa24647a0588982281f9c0;hb=28029c51a8f26ac22cc49ab3458620290d026724;hp=239684ddfe20e5c0563b11616a96f94041f099cf;hpb=4946fda52441ea9bac8462feb371959c13e398d3;p=vlc diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp index 239684ddfe..aa5010135c 100644 --- a/projects/mozilla/vlcplugin.cpp +++ b/projects/mozilla/vlcplugin.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * vlcplugin.cpp: a VLC plugin for Mozilla ***************************************************************************** - * Copyright (C) 2002-2008 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -36,6 +36,7 @@ #include "control/npolibvlc.h" #include +#include /***************************************************************************** * VlcPlugin constructor and destructor @@ -45,16 +46,19 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) : b_stream(0), b_autoplay(1), b_toolbar(0), + psz_text(NULL), psz_target(NULL), + playlist_index(-1), libvlc_instance(NULL), - libvlc_log(NULL), + libvlc_media_list(NULL), + libvlc_media_player(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) @@ -71,6 +75,10 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) : #endif { memset(&npwindow, 0, sizeof(NPWindow)); +#if defined(XP_UNIX) + memset(&npvideo, 0, sizeof(Window)); + memset(&npcontrol, 0, sizeof(Window)); +#endif } static bool boolValue(const char *value) { @@ -79,16 +87,62 @@ static bool boolValue(const char *value) { !strcasecmp(value, "yes") ); } +void eventAsync(void *param) +{ + VlcPlugin *plugin = (VlcPlugin*)param; + NPVariant result; + NPVariant params[2]; + + pthread_mutex_lock(&plugin->mutex); + + for (int i = 0; i < plugin->eventList.size(); i++) + { + for (int j = 0; j < plugin->eventListeners.size(); j++) + { + libvlc_event_type_t event = plugin->eventList[i]; + + if (plugin->eventListeners[j]->eventMap.have_event(event)) + { + STRINGZ_TO_NPVARIANT(libvlc_event_type_name(event), params[0]); + params[1] = plugin->eventListeners[j]->id; + NPN_InvokeDefault(plugin->getBrowser(), plugin->eventListeners[j]->listener, params, 2, &result); + NPN_ReleaseVariantValue(&result); + } + } + } + plugin->eventList.clear(); + + pthread_mutex_unlock(&plugin->mutex); +} + +void event_callback(const libvlc_event_t* event, void *param) +{ + VlcPlugin *plugin = (VlcPlugin*)param; + + pthread_mutex_lock(&plugin->mutex); + + if (plugin->eventToCatch.have_event(event->type)) + plugin->eventList.push_back(event->type); + + pthread_mutex_unlock(&plugin->mutex); + + NPN_PluginThreadAsyncCall(plugin->getBrowser(), eventAsync, plugin); +} + NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) { /* prepare VLC command line */ const char *ppsz_argv[32]; int ppsz_argc = 0; +#ifndef NDEBUG + ppsz_argv[ppsz_argc++] = "--no-plugins-cache"; +#endif + /* 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++] = "--vout=minimal_macosx"; #elif defined(XP_WIN) HKEY h_key; DWORD i_type, i_data = MAX_PATH + 1; @@ -116,15 +170,15 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) 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"; 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]); + /* fprintf(stderr, "argn=%s, argv=%s\n", argn[i], argv[i]); */ if( !strcmp( argn[i], "target" ) || !strcmp( argn[i], "mrl") @@ -133,6 +187,11 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) { 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") ) { @@ -153,8 +212,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) { if( boolValue(argv[i]) ) { - ppsz_argv[ppsz_argc++] = "--volume"; - ppsz_argv[ppsz_argc++] = "0"; + ppsz_argv[ppsz_argc++] = "--volume=0"; } } else if( !strcmp( argn[i], "loop") @@ -176,7 +234,11 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) } else if( !strcmp( argn[i], "toolbar" ) ) { +/* FIXME: Remove this when toolbar functionality has been implemented on + * MacOS X and Win32 for Firefox/Mozilla/Safari. */ +#ifdef XP_UNIX b_toolbar = boolValue(argv[i]); +#endif } } @@ -189,14 +251,15 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) libvlc_exception_clear(&ex); return NPERR_GENERIC_ERROR; } - libvlc_exception_clear(&ex); + + 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) ) { @@ -216,7 +279,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) { NPString &location = NPVARIANT_TO_STRING(result); - psz_baseURL = static_cast(malloc(location.utf8length+1)); + psz_baseURL = (char *) malloc(location.utf8length+1); if( psz_baseURL ) { strncpy(psz_baseURL, location.utf8characters, location.utf8length); @@ -239,6 +302,9 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) /* new APIs */ p_scriptClass = RuntimeNPClass::getClass(); + if (pthread_mutex_init(&mutex, NULL) != 0) + return NPERR_GENERIC_ERROR; + return NPERR_NO_ERROR; } @@ -246,10 +312,188 @@ VlcPlugin::~VlcPlugin() { free(psz_baseURL); free(psz_target); - if( libvlc_log ) - libvlc_log_close(libvlc_log, NULL); + free(psz_text); + + 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); + + for (int i = 0; i < eventListeners.size(); i++) + { + NPN_ReleaseObject(eventListeners[i]->listener); + NPN_ReleaseVariantValue(&(eventListeners[i]->id)); + delete eventListeners[i]; + } + + pthread_mutex_destroy(&mutex); +} + +/***************************************************************************** + * VlcPlugin playlist replacement methods + *****************************************************************************/ +void VlcPlugin::set_player_window() +{ +#ifdef XP_UNIX + libvlc_media_player_set_xwindow(libvlc_media_player, + (libvlc_drawable_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); +#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)-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_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)-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 ) +{ + libvlc_media_t *p_m = NULL; + libvlc_event_manager_t *eventManager = NULL; + + 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); + 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(); + + // Registers the events we're interested in. + eventManager = libvlc_media_player_event_manager(libvlc_media_player, ex); + + libvlc_event_attach(eventManager, libvlc_MediaPlayerOpening, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerBuffering, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerPlaying, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerStopped, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerPaused, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerEndReached, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerForward, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerBackward, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerEndReached, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerEncounteredError, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerTimeChanged, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerPositionChanged, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerTitleChanged, event_callback, this, ex); + libvlc_event_attach(eventManager, libvlc_MediaPlayerSnapshotTaken, event_callback, this, 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_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()); +} + +int VlcPlugin::playlist_count() +{ + int items_count = 0; + 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 ) +{ + if( playlist_isplaying() ) + libvlc_toggle_fullscreen(libvlc_media_player,ex); +} +void VlcPlugin::set_fullscreen( int yes, libvlc_exception_t *ex ) +{ + if( playlist_isplaying() ) + libvlc_set_fullscreen(libvlc_media_player,yes,ex); +} +int VlcPlugin::get_fullscreen( libvlc_exception_t *ex ) +{ + int r = 0; + if( playlist_isplaying() ) + r = libvlc_get_fullscreen(libvlc_media_player,ex); + return r; +} + +bool VlcPlugin::player_has_vout( libvlc_exception_t *ex ) +{ + bool r = false; + if( playlist_isplaying() ) + r = libvlc_media_player_has_vout(libvlc_media_player, ex); + return r; } /***************************************************************************** @@ -293,11 +537,11 @@ relativeurl: if( psz_baseURL ) { size_t baseLen = strlen(psz_baseURL); - char *href = static_cast(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, @@ -312,7 +556,7 @@ relativeurl: /* skip over protocol part */ char *pathstart = strchr(href, ':'); - char *pathend; + char *pathend = href+baseLen; if( pathstart ) { if( '/' == *(++pathstart) ) @@ -324,7 +568,6 @@ relativeurl: } /* skip over host part */ pathstart = strchr(pathstart, '/'); - pathend = href+baseLen; if( ! pathstart ) { // no path, add a / past end of url (over '\0') @@ -338,11 +581,10 @@ relativeurl: 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 ? */ @@ -412,7 +654,7 @@ relativeurl: return NULL; } -#if XP_UNIX +#if defined(XP_UNIX) int VlcPlugin::setSize(unsigned width, unsigned height) { int diff = (width != i_width) || (height != i_height); @@ -553,10 +795,7 @@ void VlcPlugin::hideToolbar() void VlcPlugin::redrawToolbar() { - libvlc_media_player_t *p_md = NULL; - libvlc_exception_t ex; - float f_position = 0.0; - int i_playing = 0; + int is_playing = 0; bool b_mute = false; unsigned int dst_x, dst_y; GC gc; @@ -573,26 +812,9 @@ 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 ); - - /* get isplaying */ - i_playing = libvlc_playlist_isplaying( getVLC(), &ex ); - libvlc_exception_clear( &ex ); /* get mute info */ - b_mute = libvlc_audio_get_mute( getVLC(), &ex ); - libvlc_exception_clear( &ex ); - - /* get movie position in % */ - if( i_playing == 1 ) - { - f_position = libvlc_media_player_get_position( p_md, &ex ) * 100; - libvlc_exception_clear( &ex ); - } - libvlc_media_player_release( p_md ); + b_mute = libvlc_audio_get_mute( getVLC() ); gcv.foreground = BlackPixel( p_display, 0 ); gc = XCreateGC( p_display, control, GCForeground, &gcv ); @@ -606,7 +828,7 @@ void VlcPlugin::redrawToolbar() dst_x = BTN_SPACE; dst_y = i_tb_height >> 1; /* baseline = vertical middle */ - if( p_btnPause && (i_playing == 1) ) + if( p_btnPause && (is_playing == 1) ) { XPutImage( p_display, control, gc, p_btnPause, 0, 0, dst_x, dst_y - (p_btnPause->height >> 1), @@ -657,9 +879,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() ) + { + libvlc_exception_t ex; + libvlc_exception_init( &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, @@ -672,15 +900,15 @@ void VlcPlugin::redrawToolbar() vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos ) { - unsigned int i_dest = BTN_SPACE;//(i_tb_height >> 1); - int i_playing = 0; + unsigned int i_dest = BTN_SPACE; + int is_playing = 0; bool b_mute = false; - libvlc_exception_t ex; +#ifndef NDEBUG fprintf( stderr, "ToolbarButtonClicked:: " "trying to match (%d,%d) (%d,%d)\n", i_xpos, i_ypos, i_tb_height, i_tb_width ); - +#endif if( i_ypos >= i_tb_width ) return clicked_Unknown; @@ -690,16 +918,13 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos */ /* get isplaying */ - libvlc_exception_init( &ex ); - i_playing = libvlc_playlist_isplaying( getVLC(), &ex ); - libvlc_exception_clear( &ex ); + is_playing = playlist_isplaying(); /* get mute info */ - b_mute = libvlc_audio_get_mute( getVLC(), &ex ); - libvlc_exception_clear( &ex ); + b_mute = libvlc_audio_get_mute( getVLC() ); /* is Pause of Play button clicked */ - if( (i_playing != 1) && + if( (is_playing != 1) && (i_xpos >= (BTN_SPACE>>1)) && (i_xpos <= i_dest + p_btnPlay->width + (BTN_SPACE>>1)) ) return clicked_Play; @@ -708,7 +933,7 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos return clicked_Pause; /* is Stop button clicked */ - if( i_playing != 1 ) + if( is_playing != 1 ) i_dest += (p_btnPlay->width + (BTN_SPACE>>1)); else i_dest += (p_btnPause->width + (BTN_SPACE>>1)); @@ -751,3 +976,20 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos } #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; +} +