X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=projects%2Fmozilla%2Fvlcplugin.cpp;h=aa5010135cd18bf231aa24647a0588982281f9c0;hb=28029c51a8f26ac22cc49ab3458620290d026724;hp=1b5ccee6fb8516951f2e1abc754b8498f16639fa;hpb=900e1dcdd57e1755b085cca4ab7d0078e261f363;p=vlc diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp index 1b5ccee6fb..aa5010135c 100644 --- a/projects/mozilla/vlcplugin.cpp +++ b/projects/mozilla/vlcplugin.cpp @@ -1,11 +1,12 @@ /***************************************************************************** * vlcplugin.cpp: a VLC plugin for Mozilla ***************************************************************************** - * Copyright (C) 2002-2005 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar * Damien Fouilleul + * Jean-Paul Saman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,10 +33,10 @@ #endif #include "vlcplugin.h" -#include "control/npovlc.h" #include "control/npolibvlc.h" #include +#include /***************************************************************************** * VlcPlugin constructor and destructor @@ -45,24 +46,39 @@ 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) ,i_tb_height(0) ,i_last_position(0) + ,p_btnPlay(NULL) + ,p_btnPause(NULL) + ,p_btnStop(NULL) + ,p_btnMute(NULL) + ,p_btnUnmute(NULL) + ,p_btnFullscreen(NULL) + ,p_btnTime(NULL) + ,p_timeline(NULL) #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) { @@ -71,17 +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 */ - char *ppsz_argv[32]; + 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"; - ppsz_argv[ppsz_argc++] = "/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/modules"; + ppsz_argv[ppsz_argc++] = "--vout=minimal_macosx"; #elif defined(XP_WIN) HKEY h_key; DWORD i_type, i_data = MAX_PATH + 1; @@ -109,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++] = "--intf"; - ppsz_argv[ppsz_argc++] = "dummy"; + 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") @@ -126,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") ) { @@ -146,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") @@ -157,7 +222,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) { ppsz_argv[ppsz_argc++] = "--loop"; } - else { + else + { ppsz_argv[ppsz_argc++] = "--no-loop"; } } @@ -168,24 +234,32 @@ 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 } } + libvlc_exception_t ex; + libvlc_exception_init(&ex); - - libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, NULL); - if( ! libvlc_instance ) + libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, &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) ) { @@ -205,7 +279,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) { NPString &location = NPVARIANT_TO_STRING(result); - psz_baseURL = new char[location.utf8length+1]; + psz_baseURL = (char *) malloc(location.utf8length+1); if( psz_baseURL ) { strncpy(psz_baseURL, location.utf8characters, location.utf8length); @@ -225,61 +299,201 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) } /* assign plugin script root class */ - if( (NULL != progid) && (!strcmp(progid, "VideoLAN.VLCPlugin.2")) ) - { - /* new APIs */ - p_scriptClass = RuntimeNPClass::getClass(); - } - else + /* new APIs */ + p_scriptClass = RuntimeNPClass::getClass(); + + if (pthread_mutex_init(&mutex, NULL) != 0) + return NPERR_GENERIC_ERROR; + + return NPERR_NO_ERROR; +} + +VlcPlugin::~VlcPlugin() +{ + free(psz_baseURL); + free(psz_target); + 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++) { - /* legacy APIs */ - p_scriptClass = RuntimeNPClass::getClass(); + NPN_ReleaseObject(eventListeners[i]->listener); + NPN_ReleaseVariantValue(&(eventListeners[i]->id)); + delete eventListeners[i]; } - return NPERR_NO_ERROR; + pthread_mutex_destroy(&mutex); } -#if 0 +/***************************************************************************** + * 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 -/* This is really ugly but there is a deadlock when stopping a stream - * (in VLC_CleanUp()) because the video output is a child of the drawable but - * is in a different thread. */ -static void HackStopVout( VlcPlugin* p_plugin ) + libvlc_media_player_set_hwnd(libvlc_media_player, + getWindow().window); +#endif +} + +int VlcPlugin::playlist_add( const char *mrl, libvlc_exception_t *ex ) { - MSG msg; - HWND hwnd; - vlc_value_t value; + 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 i_vlc = libvlc_get_vlc_id(p_plugin->libvlc_instance); - VLC_VariableGet( i_vlc, "drawable", &value ); +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; - hwnd = FindWindowEx( (HWND)value.i_int, 0, 0, 0 ); - if( !hwnd ) return; + libvlc_media_list_lock(libvlc_media_list); - PostMessage( hwnd, WM_CLOSE, 0, 0 ); + int count = libvlc_media_list_count(libvlc_media_list); - do + 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 ) { - while( PeekMessage( &msg, (HWND)value.i_int, 0, 0, PM_REMOVE ) ) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - if( FindWindowEx( (HWND)value.i_int, 0, 0, 0 ) ) Sleep( 10 ); + 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); + } - while( (hwnd = FindWindowEx( (HWND)value.i_int, 0, 0, 0 )) ); + + libvlc_media_release( p_m ); + return !libvlc_exception_raised(ex); + +bad_unlock: + libvlc_media_list_unlock(libvlc_media_list); + return false; } -#endif /* XP_WIN */ -#endif -VlcPlugin::~VlcPlugin() +void VlcPlugin::playlist_delete_item( int idx, libvlc_exception_t *ex ) { - delete psz_baseURL; - delete psz_target; - if( libvlc_log ) - libvlc_log_close(libvlc_log, NULL); - if( libvlc_instance ) - libvlc_release(libvlc_instance); + 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; } /***************************************************************************** @@ -323,11 +537,11 @@ relativeurl: if( psz_baseURL ) { size_t baseLen = strlen(psz_baseURL); - char *href = new char[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, @@ -342,7 +556,7 @@ relativeurl: /* skip over protocol part */ char *pathstart = strchr(href, ':'); - char *pathend; + char *pathend = href+baseLen; if( pathstart ) { if( '/' == *(++pathstart) ) @@ -354,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') @@ -368,10 +581,10 @@ relativeurl: if( '/' != *href ) { /* baseURL is not an absolute path */ + free(href); return NULL; } pathstart = href; - pathend = href+baseLen; } /* relative URL made of an absolute path ? */ @@ -441,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); @@ -453,79 +666,103 @@ int VlcPlugin::setSize(unsigned width, unsigned height) return diff; } +#define BTN_SPACE ((unsigned int)4) void VlcPlugin::showToolbar() { const NPWindow& window = getWindow(); Window control = getControlWindow(); + Window video = getVideoWindow(); Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display; - unsigned int i_height = 0, i_width = 0; + unsigned int i_height = 0, i_width = BTN_SPACE; /* load icons */ - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/play.xpm", - &p_btnPlay, NULL, NULL); + if( !p_btnPlay ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/play.xpm", + &p_btnPlay, NULL, NULL); if( p_btnPlay ) { i_height = __MAX( i_height, p_btnPlay->height ); - i_width = __MAX( i_width, p_btnPlay->width ); } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/pause.xpm", - &p_btnPause, NULL, NULL); + if( !p_btnPause ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/pause.xpm", + &p_btnPause, NULL, NULL); if( p_btnPause ) { i_height = __MAX( i_height, p_btnPause->height ); - i_width = __MAX( i_width, p_btnPause->width ); } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/stop.xpm", - &p_btnStop, NULL, NULL ); + i_width += __MAX( p_btnPause->width, p_btnPlay->width ); + + if( !p_btnStop ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/stop.xpm", + &p_btnStop, NULL, NULL ); if( p_btnStop ) { i_height = __MAX( i_height, p_btnStop->height ); - i_width = __MAX( i_width, p_btnStop->width ); + i_width += BTN_SPACE + p_btnStop->width; } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_line.xpm", - &p_timeline, NULL, NULL); + if( !p_timeline ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_line.xpm", + &p_timeline, NULL, NULL); if( p_timeline ) { i_height = __MAX( i_height, p_timeline->height ); - i_width = __MAX( i_width, p_timeline->width ); + i_width += BTN_SPACE + p_timeline->width; } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_icon.xpm", - &p_btnTime, NULL, NULL); + if( !p_btnTime ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_icon.xpm", + &p_btnTime, NULL, NULL); if( p_btnTime ) { i_height = __MAX( i_height, p_btnTime->height ); - i_width = __MAX( i_width, p_btnTime->width ); + i_width += BTN_SPACE + p_btnTime->width; } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/fullscreen.xpm", - &p_btnFullscreen, NULL, NULL); + if( !p_btnFullscreen ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/fullscreen.xpm", + &p_btnFullscreen, NULL, NULL); if( p_btnFullscreen ) { i_height = __MAX( i_height, p_btnFullscreen->height ); - i_width = __MAX( i_width, p_btnFullscreen->width ); + i_width += BTN_SPACE + p_btnFullscreen->width; } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_max.xpm", - &p_btnMute, NULL, NULL); + if( !p_btnMute ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_max.xpm", + &p_btnMute, NULL, NULL); if( p_btnMute ) { i_height = __MAX( i_height, p_btnMute->height ); - i_width = __MAX( i_width, p_btnMute->width ); } - XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_mute.xpm", - &p_btnUnmute, NULL, NULL); + if( !p_btnUnmute ) + XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_mute.xpm", + &p_btnUnmute, NULL, NULL); if( p_btnUnmute ) { i_height = __MAX( i_height, p_btnUnmute->height ); - i_width = __MAX( i_width, p_btnUnmute->width ); } + i_width += BTN_SPACE + __MAX( p_btnUnmute->width, p_btnMute->width ); + setToolbarSize( i_width, i_height ); if( !p_btnPlay || !p_btnPause || !p_btnStop || !p_timeline || !p_btnTime || !p_btnFullscreen || !p_btnMute || !p_btnUnmute ) fprintf(stderr, "Error: some button images not found in %s\n", DATA_PATH ); + + /* reset panels position and size */ + /* XXX use i_width */ + XResizeWindow( p_display, video, window.width, window.height - i_height); + XMoveWindow( p_display, control, 0, window.height - i_height ); + XResizeWindow( p_display, control, window.width, i_height -1); + + b_toolbar = 1; /* says toolbar is now shown */ + redrawToolbar(); } void VlcPlugin::hideToolbar() { + const NPWindow& window = getWindow(); + Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display; + Window control = getControlWindow(); + Window video = getVideoWindow(); + i_tb_width = i_tb_height = 0; if( p_btnPlay ) XDestroyImage( p_btnPlay ); @@ -545,47 +782,39 @@ void VlcPlugin::hideToolbar() p_btnFullscreen = NULL; p_btnMute = NULL; p_btnUnmute = NULL; + + /* reset panels position and size */ + /* XXX use i_width */ + XResizeWindow( p_display, video, window.width, window.height ); + XMoveWindow( p_display, control, 0, window.height-1 ); + XResizeWindow( p_display, control, window.width, 1 ); + + b_toolbar = 0; /* says toolbar is now hidden */ + redrawToolbar(); } void VlcPlugin::redrawToolbar() { - libvlc_media_instance_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; XGCValues gcv; -#define BTN_SPACE ((unsigned int)4) + unsigned int i_tb_width, i_tb_height; + + /* This method does nothing if toolbar is hidden. */ + if( !b_toolbar ) + return; const NPWindow& window = getWindow(); Window control = getControlWindow(); Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display; - /* get media instance */ - libvlc_exception_init( &ex ); - p_md = libvlc_playlist_get_media_instance( getVLC(), &ex ); - libvlc_exception_clear( &ex ); + getToolbarSize( &i_tb_width, &i_tb_height ); - /* get isplaying */ - libvlc_exception_init( &ex ); - i_playing = libvlc_playlist_isplaying( getVLC(), &ex ); - libvlc_exception_clear( &ex ); /* get mute info */ - libvlc_exception_init(&ex); - b_mute = libvlc_audio_get_mute( getVLC(), &ex ); - libvlc_exception_clear( &ex ); - - /* get movie position in % */ - if( i_playing == 1 ) - { - libvlc_exception_init( &ex ); - f_position = libvlc_media_instance_get_position( p_md, &ex ) * 100; - libvlc_exception_clear( &ex ); - } - libvlc_media_instance_release( p_md ); + b_mute = libvlc_audio_get_mute( getVLC() ); gcv.foreground = BlackPixel( p_display, 0 ); gc = XCreateGC( p_display, control, GCForeground, &gcv ); @@ -596,66 +825,171 @@ void VlcPlugin::redrawToolbar() XChangeGC( p_display, gc, GCForeground, &gcv ); /* position icons */ - dst_x = 4; dst_y = 4; + dst_x = BTN_SPACE; + dst_y = i_tb_height >> 1; /* baseline = vertical middle */ - fprintf( stderr, ">>>>>> is playing = %d\n", i_playing ); - 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, + XPutImage( p_display, control, gc, p_btnPause, 0, 0, dst_x, + dst_y - (p_btnPause->height >> 1), p_btnPause->width, p_btnPause->height ); + dst_x += BTN_SPACE + p_btnPause->width; } else if( p_btnPlay ) { - XPutImage( p_display, control, gc, p_btnPlay, 0, 0, dst_x, dst_y, + XPutImage( p_display, control, gc, p_btnPlay, 0, 0, dst_x, + dst_y - (p_btnPlay->height >> 1), p_btnPlay->width, p_btnPlay->height ); + dst_x += BTN_SPACE + p_btnPlay->width; } - dst_x += BTN_SPACE + ( p_btnPlay ? p_btnPlay->width : 0 ); - dst_y = 4; - if( p_btnStop ) - XPutImage( p_display, control, gc, p_btnStop, 0, 0, dst_x, dst_y, + XPutImage( p_display, control, gc, p_btnStop, 0, 0, dst_x, + dst_y - (p_btnStop->height >> 1), p_btnStop->width, p_btnStop->height ); dst_x += BTN_SPACE + ( p_btnStop ? p_btnStop->width : 0 ); - dst_y = 4; if( p_btnFullscreen ) - XPutImage( p_display, control, gc, p_btnFullscreen, 0, 0, dst_x, dst_y, + XPutImage( p_display, control, gc, p_btnFullscreen, 0, 0, dst_x, + dst_y - (p_btnFullscreen->height >> 1), p_btnFullscreen->width, p_btnFullscreen->height ); dst_x += BTN_SPACE + ( p_btnFullscreen ? p_btnFullscreen->width : 0 ); - dst_y = 4; if( p_btnUnmute && b_mute ) { - XPutImage( p_display, control, gc, p_btnUnmute, 0, 0, dst_x, dst_y, + XPutImage( p_display, control, gc, p_btnUnmute, 0, 0, dst_x, + dst_y - (p_btnUnmute->height >> 1), p_btnUnmute->width, p_btnUnmute->height ); dst_x += BTN_SPACE + ( p_btnUnmute ? p_btnUnmute->width : 0 ); - dst_y = 4; } else if( p_btnMute ) { - XPutImage( p_display, control, gc, p_btnMute, 0, 0, dst_x, dst_y, + XPutImage( p_display, control, gc, p_btnMute, 0, 0, dst_x, + dst_y - (p_btnMute->height >> 1), p_btnMute->width, p_btnMute->height ); dst_x += BTN_SPACE + ( p_btnMute ? p_btnMute->width : 0 ); - dst_y = 4; } if( p_timeline ) - XPutImage( p_display, control, gc, p_timeline, 0, 0, dst_x, dst_y, + XPutImage( p_display, control, gc, p_timeline, 0, 0, dst_x, + dst_y - (p_timeline->height >> 1), (window.width-(dst_x+BTN_SPACE)), p_timeline->height ); - if( f_position > 0 ) - i_last_position = (((float)window.width-8.0)/100.0)*f_position; + /* 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, - 0, 0, (dst_x+i_last_position), dst_y, + 0, 0, (dst_x+i_last_position), + dst_y - (p_btnTime->height >> 1), p_btnTime->width, p_btnTime->height ); XFreeGC( p_display, gc ); } + +vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos ) +{ + unsigned int i_dest = BTN_SPACE; + int is_playing = 0; + bool b_mute = false; + +#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; + + /* Note: the order of testing is dependend on the original + * drawing positions of the icon buttons. Buttons are tested + * left to right. + */ + + /* get isplaying */ + is_playing = playlist_isplaying(); + + /* get mute info */ + b_mute = libvlc_audio_get_mute( getVLC() ); + + /* is Pause of Play button clicked */ + if( (is_playing != 1) && + (i_xpos >= (BTN_SPACE>>1)) && + (i_xpos <= i_dest + p_btnPlay->width + (BTN_SPACE>>1)) ) + return clicked_Play; + else if( (i_xpos >= (BTN_SPACE>>1)) && + (i_xpos <= i_dest + p_btnPause->width) ) + return clicked_Pause; + + /* is Stop button clicked */ + if( is_playing != 1 ) + i_dest += (p_btnPlay->width + (BTN_SPACE>>1)); + else + i_dest += (p_btnPause->width + (BTN_SPACE>>1)); + + if( (i_xpos >= i_dest) && + (i_xpos <= i_dest + p_btnStop->width + (BTN_SPACE>>1)) ) + return clicked_Stop; + + /* is Fullscreen button clicked */ + i_dest += (p_btnStop->width + (BTN_SPACE>>1)); + if( (i_xpos >= i_dest) && + (i_xpos <= i_dest + p_btnFullscreen->width + (BTN_SPACE>>1)) ) + return clicked_Fullscreen; + + /* is Mute or Unmute button clicked */ + i_dest += (p_btnFullscreen->width + (BTN_SPACE>>1)); + if( !b_mute && (i_xpos >= i_dest) && + (i_xpos <= i_dest + p_btnMute->width + (BTN_SPACE>>1)) ) + return clicked_Mute; + else if( (i_xpos >= i_dest) && + (i_xpos <= i_dest + p_btnUnmute->width + (BTN_SPACE>>1)) ) + return clicked_Unmute; + + /* is timeline clicked */ + if( !b_mute ) + i_dest += (p_btnMute->width + (BTN_SPACE>>1)); + else + i_dest += (p_btnUnmute->width + (BTN_SPACE>>1)); + if( (i_xpos >= i_dest) && + (i_xpos <= i_dest + p_timeline->width + (BTN_SPACE>>1)) ) + return clicked_timeline; + + /* is time button clicked */ + i_dest += (p_timeline->width + (BTN_SPACE>>1)); + if( (i_xpos >= i_dest) && + (i_xpos <= i_dest + p_btnTime->width + (BTN_SPACE>>1)) ) + return clicked_Time; + + return clicked_Unknown; +} +#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; +} +