/*****************************************************************************
* vlcshell.cpp: a VLC plugin for Mozilla
*****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
+ * Jean-Paul Saman <jpsaman@videolan.org>
*
* 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
#include <string.h>
#include <stdlib.h>
-/* Mozilla stuff */
-#ifdef HAVE_MOZILLA_CONFIG_H
-# include <mozilla-config.h>
-#endif
-
-#ifdef XP_UNIX
-#ifndef __APPLE__
-#include <X11/xpm.h>
-#endif
-#endif
-
/* This is from mozilla java, do we really need it? */
#if 0
#include <jri.h>
#endif
#include "vlcplugin.h"
+#include "vlcshell.h"
/* Enable/disable debugging printf's for X11 resizing */
#undef X11_RESIZE_DEBUG
-#define WINDOW_TEXT "Video is loading..."
-
-#ifndef __MAX
-# define __MAX(a, b) ( ((a) > (b)) ? (a) : (b) )
-#endif
-#ifndef __MIN
-# define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
-#endif
-
/*****************************************************************************
* Unix-only declarations
******************************************************************************/
-#ifdef XP_UNIX
+#if defined(XP_UNIX)
static void Redraw( Widget w, XtPointer closure, XEvent *event );
static void ControlHandler( Widget w, XtPointer closure, XEvent *event );
*****************************************************************************/
char * NPP_GetMIMEDescription( void )
{
- return PLUGIN_MIMETYPES;
+ static char mimetype[] = PLUGIN_MIMETYPES;
+ return mimetype;
}
NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
{
-
+ static char psz_name[] = PLUGIN_NAME;
static char psz_desc[1000];
/* plugin class variables */
switch( variable )
{
case NPPVpluginNameString:
- *((char **)value) = PLUGIN_NAME;
+ *((char **)value) = psz_name;
return NPERR_NO_ERROR;
case NPPVpluginDescriptionString:
- snprintf( psz_desc, sizeof(psz_desc), PLUGIN_DESCRIPTION, VLC_Version() );
+ snprintf( psz_desc, sizeof(psz_desc), PLUGIN_DESCRIPTION,
+ libvlc_get_version() );
*((char **)value) = psz_desc;
return NPERR_NO_ERROR;
* Mac-only API calls
*****************************************************************************/
#ifdef XP_MACOSX
-int16 NPP_HandleEvent( NPP instance, void * event )
+int16_t NPP_HandleEvent( NPP instance, void * event )
{
static UInt32 lastMouseUp = 0;
-
if( instance == NULL )
{
return false;
}
- VlcPlugin *p_plugin = (VlcPlugin*)instance->pdata;
-
+ VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
if( p_plugin == NULL )
{
return false;
if( (myEvent->when - lastMouseUp) < GetDblTime() )
{
/* double click */
- libvlc_instance_t *p_vlc = p_plugin->getVLC();
-
- if( p_vlc )
- {
- if( libvlc_playlist_isplaying(p_vlc, NULL) )
- {
- libvlc_media_instance_t *p_md =
- libvlc_playlist_get_media_instance(p_vlc, NULL);
- if( p_md )
- {
- libvlc_toggle_fullscreen(p_md, NULL);
- libvlc_media_instance_release(p_md);
- }
- }
- }
+ p_plugin->toggle_fullscreen();
}
return true;
}
const NPWindow& npwindow = p_plugin->getWindow();
if( npwindow.window )
{
- int hasVout = FALSE;
- libvlc_instance_t *p_vlc = p_plugin->getVLC();
+ bool hasVout = false;
- if( p_vlc )
+ if( p_plugin->playlist_isplaying() )
{
- if( libvlc_playlist_isplaying(p_vlc, NULL) )
+ hasVout = p_plugin->player_has_vout();
+#if 0
+ if( hasVout )
{
- libvlc_media_instance_t *p_md =
- libvlc_playlist_get_media_instance(p_vlc, NULL);
- if( p_md )
- {
- hasVout = libvlc_media_instance_has_vout(p_md, NULL);
- if( hasVout )
- {
- libvlc_rectangle_t area;
- area.left = 0;
- area.top = 0;
- area.right = npwindow.width;
- area.bottom = npwindow.height;
- libvlc_video_redraw_rectangle(p_md, &area, NULL);
- }
- libvlc_media_instance_release(p_md);
- }
+ libvlc_rectangle_t area;
+ area.left = 0;
+ area.top = 0;
+ area.right = npwindow.width;
+ area.bottom = npwindow.height;
+ libvlc_video_redraw_rectangle(p_plugin->getMD(), &area, NULL);
}
+#else
+#warning disabled code
+#endif
}
if( ! hasVout )
ForeColor(blackColor);
PenMode( patCopy );
- /* seems that firefox forgets to set the following on occasion (reload) */
+ /* seems that firefox forgets to set the following
+ * on occasion (reload) */
SetOrigin(((NP_Port *)npwindow.window)->portx,
((NP_Port *)npwindow.window)->porty);
ForeColor(whiteColor);
MoveTo( (npwindow.width-80)/ 2 , npwindow.height / 2 );
- DrawText( WINDOW_TEXT , 0 , strlen(WINDOW_TEXT) );
+ if( p_plugin->psz_text )
+ DrawText( p_plugin->psz_text, 0, strlen(p_plugin->psz_text) );
}
}
return true;
return NPERR_NO_ERROR;
}
+#ifdef OJI
jref NPP_GetJavaClass( void )
{
return NULL;
}
+#endif
void NPP_Shutdown( void )
{
;
}
-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+NPError NPP_New( NPMIMEType pluginType, NPP instance,
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ uint16 mode, int16 argc,
+#else
+ uint16_t mode, int16_t argc,
+#endif
char* argn[], char* argv[], NPSavedData* saved )
{
NPError status;
instance->pdata = NULL;
-#if XP_WIN
+#if defined(XP_WIN)
HWND win = (HWND)p_plugin->getWindow().window;
WNDPROC winproc = p_plugin->getWindowProc();
if( winproc )
}
#endif
+ if( p_plugin->playlist_isplaying() )
+ p_plugin->playlist_stop();
+
delete p_plugin;
return NPERR_NO_ERROR;
NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
+#if defined(XP_UNIX)
+ Window control;
+ unsigned int i_control_height = 0, i_control_width = 0;
+#endif
+
if( ! instance )
{
return NPERR_INVALID_INSTANCE_ERROR;
/* NPP_SetWindow may be called before NPP_New (Opera) */
VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
- if( ! p_plugin )
+ if( NULL == p_plugin )
{
/* we should probably show a splash screen here */
return NPERR_NO_ERROR;
}
+#if defined(XP_UNIX)
+ control = p_plugin->getControlWindow();
+#endif
+
libvlc_instance_t *p_vlc = p_plugin->getVLC();
/*
{
/* check if plugin has a new parent window */
CGrafPtr drawable = (((NP_Port*) (window->window))->port);
- if( !curwin.window || drawable != (((NP_Port*) (curwin.window))->port) )
- {
- /* set/change parent window */
- libvlc_video_set_parent(p_vlc, (libvlc_drawable_t)drawable, NULL);
- }
/* as MacOS X video output is windowless, set viewport */
libvlc_rectangle_t view, clip;
/*
- ** browser sets port origin to top-left location of plugin relative to GrafPort
- ** window origin is set relative to document, which of little use for drawing
+ ** browser sets port origin to top-left location of plugin
+ ** relative to GrafPort window origin is set relative to document,
+ ** which of little use for drawing
*/
view.top = ((NP_Port*) (window->window))->porty;
view.left = ((NP_Port*) (window->window))->portx;
view.bottom = window->height+view.top;
view.right = window->width+view.left;
+
/* clipRect coordinates are also relative to GrafPort */
clip.top = window->clipRect.top;
clip.left = window->clipRect.left;
clip.bottom = window->clipRect.bottom;
clip.right = window->clipRect.right;
-
- libvlc_video_set_viewport(p_vlc, &view, &clip, NULL);
-
+#ifdef NOT_WORKING
+ libvlc_video_set_viewport(p_vlc, p_plugin->getMD(), &view, &clip);
+#else
+#warning disabled code
+#endif
/* remember new window */
p_plugin->setWindow(*window);
}
- else if( curwin.window ) {
+ else if( curwin.window )
+ {
/* change/set parent */
- libvlc_video_set_parent(p_vlc, 0, NULL);
curwin.window = NULL;
}
#endif /* XP_MACOSX */
style |= WS_CLIPCHILDREN|WS_CLIPSIBLINGS;
SetWindowLong((HWND)drawable, GWL_STYLE, style);
- /* change/set parent */
- libvlc_video_set_parent(p_vlc, (libvlc_drawable_t)drawable, NULL);
-
/* remember new window */
p_plugin->setWindow(*window);
UpdateWindow( (HWND)drawable );
}
}
- else if ( curwin.window )
+ else if( curwin.window )
{
/* reset WNDPROC */
HWND oldwin = (HWND)curwin.window;
SetWindowLong( oldwin, GWL_WNDPROC, (LONG)(p_plugin->getWindowProc()) );
p_plugin->setWindowProc(NULL);
- /* change/set parent */
- libvlc_video_set_parent(p_vlc, 0, NULL);
+
curwin.window = NULL;
}
#endif /* XP_WIN */
-#ifdef XP_UNIX
+#if defined(XP_UNIX)
+ /* default to hidden toolbar, shown at the end of this method if asked *
+ * developers note : getToolbarSize need to wait the end of this method
+ */
+ i_control_height = 0;
+ i_control_width = window->width;
+
if( window && window->window )
{
- Window parent = (Window) window->window;
+ Window parent = (Window) window->window;
if( !curwin.window || (parent != (Window)curwin.window) )
{
- Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
+ Display *p_display = ( (NPSetWindowCallbackStruct *)
+ window->ws_info )->display;
XResizeWindow( p_display, parent, window->width, window->height );
int i_blackColor = BlackPixel(p_display, DefaultScreen(p_display));
+ /* create windows */
Window video = XCreateSimpleWindow( p_display, parent, 0, 0,
- window->width, window->height - p_plugin->i_control_height, 0,
- i_blackColor, i_blackColor );
- Window controls = XCreateSimpleWindow( p_display, parent, 0,
- window->height - p_plugin->i_control_height-1, window->width,
- p_plugin->i_control_height-1, 0, i_blackColor, i_blackColor );
+ window->width, window->height - i_control_height,
+ 0, i_blackColor, i_blackColor );
+ Window controls = (Window) NULL;
+ controls = XCreateSimpleWindow( p_display, parent,
+ 0, window->height - i_control_height-1,
+ window->width, i_control_height-1,
+ 0, i_blackColor, i_blackColor );
XMapWindow( p_display, parent );
XMapWindow( p_display, video );
- XMapWindow( p_display, controls );
+ if( controls ) { XMapWindow( p_display, controls ); }
XFlush(p_display);
+ /* bind events */
Widget w = XtWindowToWidget( p_display, parent );
XtAddEventHandler( w, ExposureMask, FALSE,
XtAddEventHandler( w, ButtonReleaseMask, FALSE,
(XtEventHandler)ControlHandler, p_plugin );
- /* callback */
-/*
- libvlc_media_instance_t *p_md;
-
- libvlc_exception_t ex;
- libvlc_exception_init(& ex );
- p_md = libvlc_playlist_get_media_instance( p_plugin->getVLC(), &ex );
- libvlc_exception_init( &ex );
- libvlc_event_attach( libvlc_media_instance_event_manager( p_md, &ex ),
- libvlc_MediaInstancePositionChanged, Redraw, NULL, &ex );
-*/
-
- /* set/change parent window */
- libvlc_video_set_parent( p_vlc, (libvlc_drawable_t) video, NULL );
-
/* remember window */
p_plugin->setWindow( *window );
p_plugin->setVideoWindow( video );
- p_plugin->setControlWindow( controls );
+
+ if( controls )
+ {
+ p_plugin->setControlWindow( controls );
+ }
Redraw( w, (XtPointer)p_plugin, NULL );
+
+ /* now display toolbar if asked through parameters */
+ if( p_plugin->b_toolbar )
+ {
+ p_plugin->showToolbar();
+ }
}
}
- else if ( curwin.window )
+ else if( curwin.window )
{
- /* change/set parent */
- libvlc_video_set_parent(p_vlc, 0, NULL);
curwin.window = NULL;
}
#endif /* XP_UNIX */
{
if( p_plugin->psz_target )
{
- if( libvlc_playlist_add( p_vlc, p_plugin->psz_target,
- NULL, NULL ) != -1 )
+ if( p_plugin->playlist_add( p_plugin->psz_target ) != -1 )
{
if( p_plugin->b_autoplay )
{
- libvlc_playlist_play(p_vlc, 0, 0, NULL, NULL);
+ p_plugin->playlist_play();
}
}
- p_plugin->b_stream = VLC_TRUE;
+ p_plugin->b_stream = true;
}
}
return NPERR_NO_ERROR;
}
NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
NPBool seekable, uint16 *stype )
+#else
+ NPBool seekable, uint16_t *stype )
+#endif
{
if( NULL == instance )
{
return NPERR_GENERIC_ERROR;
}
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
int32 NPP_WriteReady( NPP instance, NPStream *stream )
+#else
+int32_t NPP_WriteReady( NPP instance, NPStream *stream )
+#endif
{
/* TODO */
return 8*1024;
}
-
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
int32 len, void *buffer )
+#else
+int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
+ int32_t len, void *buffer )
+#endif
{
/* TODO */
return len;
}
-
NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason )
{
if( instance == NULL )
return NPERR_NO_ERROR;
}
-
void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
{
if( instance == NULL )
return;
}
- if( libvlc_playlist_add( p_plugin->getVLC(), fname, stream->url, NULL ) != -1 )
+ if( p_plugin->playlist_add( stream->url ) != -1 )
{
if( p_plugin->b_autoplay )
{
- libvlc_playlist_play( p_plugin->getVLC(), 0, 0, NULL, NULL);
+ p_plugin->playlist_play();
}
}
}
-
void NPP_URLNotify( NPP instance, const char* url,
NPReason reason, void* notifyData )
{
\*********************************************/
}
-
void NPP_Print( NPP instance, NPPrint* printInfo )
{
if( printInfo == NULL )
/******************************************************************************
* Windows-only methods
*****************************************************************************/
-#if XP_WIN
+#if defined(XP_WIN)
static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
{
VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(GetWindowLongPtr(p_hwnd, GWLP_USERDATA));
FillRect( hdc, &rect, (HBRUSH)GetStockObject(BLACK_BRUSH) );
SetTextColor(hdc, RGB(255, 255, 255));
SetBkColor(hdc, RGB(0, 0, 0));
- DrawText( hdc, WINDOW_TEXT, strlen(WINDOW_TEXT), &rect,
- DT_CENTER|DT_VCENTER|DT_SINGLELINE);
+ if( p_plugin->psz_text )
+ DrawText( hdc, p_plugin->psz_text, strlen(p_plugin->psz_text), &rect,
+ DT_CENTER|DT_VCENTER|DT_SINGLELINE);
EndPaint( p_hwnd, &paintstruct );
return 0L;
}
default:
/* delegate to default handler */
- return CallWindowProc(p_plugin->getWindowProc(), p_hwnd, i_msg, wpar, lpar );
+ return CallWindowProc( p_plugin->getWindowProc(), p_hwnd,
+ i_msg, wpar, lpar );
}
}
#endif /* XP_WIN */
/******************************************************************************
* UNIX-only methods
*****************************************************************************/
-#ifdef XP_UNIX
+#if defined(XP_UNIX)
static void Redraw( Widget w, XtPointer closure, XEvent *event )
{
VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(closure);
+ Window control = p_plugin->getControlWindow();
const NPWindow& window = p_plugin->getWindow();
GC gc;
XGCValues gcv;
+ unsigned int i_control_height, i_control_width;
- /* Toolbar */
- XImage *p_btnPlay = NULL;
- XImage *p_btnPause = NULL;
- XImage *p_btnStop = NULL;
- XImage *p_timeline = NULL;
- XImage *p_btnTime = NULL;
- XImage *p_btnFullscreen = NULL;
- XImage *p_btnMute = NULL;
- XImage *p_btnUnmute = NULL;
-
- libvlc_media_instance_t *p_md = NULL;
- float f_position = 0;
- int i_playing = 0;
- bool b_mute = false;
+ if( p_plugin->b_toolbar )
+ p_plugin->getToolbarSize( &i_control_width, &i_control_height );
+ else
+ i_control_height = i_control_width = 0;
Window video = p_plugin->getVideoWindow();
- Window control = p_plugin->getControlWindow();
Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display;
- /* load icons */
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/play.xpm",
- &p_btnPlay, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnPlay->height );
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/pause.xpm",
- &p_btnPause, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnPause->height );
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/stop.xpm",
- &p_btnStop, NULL, NULL );
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnStop->height );
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_line.xpm",
- &p_timeline, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_timeline->height );
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_icon.xpm",
- &p_btnTime, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnTime->height );
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/fullscreen.xpm",
- &p_btnFullscreen, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnFullscreen->height);
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_max.xpm",
- &p_btnMute, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnMute->height);
- XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_mute.xpm",
- &p_btnUnmute, NULL, NULL);
- p_plugin->i_control_height = __MAX( p_plugin->i_control_height,
- p_btnUnmute->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 );
-
gcv.foreground = BlackPixel( p_display, 0 );
gc = XCreateGC( p_display, video, GCForeground, &gcv );
XFillRectangle( p_display, video, gc,
- 0, 0, window.width, window.height - p_plugin->i_control_height );
+ 0, 0, window.width, window.height - i_control_height);
gcv.foreground = WhitePixel( p_display, 0 );
XChangeGC( p_display, gc, GCForeground, &gcv );
- XDrawString( p_display, video, gc,
- window.width / 2 - 40, (window.height - p_plugin->i_control_height) / 2,
- WINDOW_TEXT, strlen(WINDOW_TEXT) );
-
- /* RedrawToolbar */
- gcv.foreground = BlackPixel( p_display, 0 );
- gc = XCreateGC( p_display, control, GCForeground, &gcv );
-
- XFillRectangle( p_display, control, gc,
- 0, 0, window.width, p_plugin->i_control_height );
-
-
- gcv.foreground = WhitePixel( p_display, 0 );
- XChangeGC( p_display, gc, GCForeground, &gcv );
-
- /* get media instance */
- libvlc_exception_t ex;
- libvlc_exception_init( &ex );
- p_md = libvlc_playlist_get_media_instance( p_plugin->getVLC(), &ex );
- libvlc_exception_clear( &ex );
-
- /* get isplaying */
- libvlc_exception_init( &ex );
- i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
- libvlc_exception_clear( &ex );
-
- /* get mute info */
- libvlc_exception_init(&ex);
- b_mute = libvlc_audio_get_mute( p_plugin->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);
-
- /* position icons */
- if( p_btnPause && (i_playing == 1) )
- {
- XPutImage( p_display, control, gc, p_btnPause, 0, 0, 4, 14,
- p_btnPause->width, p_btnPause->height );
- }
- else if( p_btnPlay )
- {
- XPutImage( p_display, control, gc, p_btnPlay, 0, 0, 4, 14,
- p_btnPlay->width, p_btnPlay->height );
- }
-
- if( p_btnStop )
- XPutImage( p_display, control, gc, p_btnStop, 0, 0, 39, 14,
- p_btnStop->width, p_btnStop->height );
- if( p_btnFullscreen )
- XPutImage( p_display, control, gc, p_btnFullscreen, 0, 0, 67, 21,
- p_btnFullscreen->width, p_btnFullscreen->height );
-
- if( p_btnUnmute && b_mute )
- {
- XPutImage( p_display, control, gc, p_btnUnmute, 0, 0, 94, 30,
- p_btnUnmute->width, p_btnUnmute->height );
- }
- else if( p_btnMute )
- {
- XPutImage( p_display, control, gc, p_btnMute, 0, 0, 94, 30,
- p_btnMute->width, p_btnMute->height );
- }
-
- if( p_timeline )
- XPutImage( p_display, control, gc, p_timeline, 0, 0, 4, 4,
- (window.width-8), p_timeline->height );
- if( p_btnTime && (f_position > 0) )
- {
- f_position = (((float)window.width-8)/100)*f_position;
- XPutImage( p_display, control, gc, p_btnTime, 0, 0, (4+f_position), 2,
- p_btnTime->width, p_btnTime->height );
- }
-
- /* Cleanup */
- if( p_btnPlay ) XDestroyImage( p_btnPlay );
- if( p_btnPause ) XDestroyImage( p_btnPause );
- if( p_btnStop ) XDestroyImage( p_btnStop );
- if( p_timeline ) XDestroyImage( p_timeline );
- if( p_btnTime ) XDestroyImage( p_btnTime );
- if( p_btnFullscreen ) XDestroyImage( p_btnFullscreen );
- if( p_btnMute ) XDestroyImage( p_btnMute );
- if( p_btnUnmute ) XDestroyImage( p_btnUnmute );
-
+ if( p_plugin->psz_text )
+ XDrawString( p_display, video, gc,
+ window.width / 2 - 40, (window.height - i_control_height) / 2,
+ p_plugin->psz_text, strlen(p_plugin->psz_text) );
XFreeGC( p_display, gc );
+
+ p_plugin->redrawToolbar();
}
static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
int i_xPos = event->xbutton.x;
int i_yPos = event->xbutton.y;
- if( p_plugin )
+ if( p_plugin && p_plugin->b_toolbar )
{
- libvlc_exception_t ex;
- libvlc_exception_init( &ex );
- libvlc_media_instance_t *p_md =
- libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);
- libvlc_exception_clear( &ex );
-
- /* jump in the movie */
- if( i_yPos <= (i_height-30) )
- {
- vlc_int64_t f_length;
- libvlc_exception_init( &ex );
- f_length = libvlc_media_instance_get_length( p_md, &ex ) / 100;
- libvlc_exception_clear( &ex );
+ int i_playing;
- f_length = (float)f_length *
- ( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) );
+ libvlc_media_player_t *p_md = p_plugin->getMD();
- libvlc_exception_init( &ex );
- libvlc_media_instance_set_time( p_md, f_length, &ex );
- libvlc_exception_clear( &ex );
- }
+ i_playing = p_plugin->playlist_isplaying();
- /* play/pause toggle */
- if( (i_yPos > (i_height-30)) && (i_xPos > 4) && (i_xPos <= 39) )
+ vlc_toolbar_clicked_t clicked;
+ clicked = p_plugin->getToolbarButtonClicked( i_xPos, i_yPos );
+ switch( clicked )
{
- int i_playing;
- libvlc_exception_init( &ex );
- i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
- libvlc_exception_clear( &ex );
-
- libvlc_exception_init( &ex );
- if( i_playing == 1 )
- libvlc_playlist_pause( p_plugin->getVLC(), &ex );
- else
- libvlc_playlist_play( p_plugin->getVLC(), -1, 0, NULL, &ex );
- libvlc_exception_clear( &ex );
- }
+ case clicked_Play:
+ case clicked_Pause:
+ {
+ if( i_playing == 1 )
+ p_plugin->playlist_pause();
+ else
+ p_plugin->playlist_play();
+ }
+ break;
- /* stop */
- if( (i_yPos > (i_height-30)) && (i_xPos > 39) && (i_xPos < 67) )
- {
- libvlc_exception_init( &ex );
- libvlc_playlist_stop( p_plugin->getVLC(), &ex );
- libvlc_exception_clear( &ex );
- }
+ case clicked_Stop:
+ {
+ p_plugin->playlist_stop();
+ }
+ break;
- /* fullscreen */
- if( (i_yPos > (i_height-30)) && (i_xPos >= 67) && (i_xPos < 94) )
- {
- int i_playing;
- libvlc_exception_init( &ex );
- i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
- libvlc_exception_clear( &ex );
+ case clicked_Fullscreen:
+ {
+ p_plugin->set_fullscreen( 1 );
+ }
+ break;
- if( i_playing == 1 )
+ case clicked_Mute:
+ case clicked_Unmute:
{
- libvlc_exception_init( &ex );
- libvlc_set_fullscreen( p_md, 1, &ex );
- libvlc_exception_clear( &ex );
+ if( p_md )
+ libvlc_audio_toggle_mute( p_md );
}
- }
+ break;
- /* mute toggle */
- if( (i_yPos > (i_height-30)) && (i_xPos >= 94) && (i_xPos < 109))
- {
- libvlc_exception_init( &ex );
- libvlc_audio_toggle_mute( p_plugin->getVLC(), &ex );
- libvlc_exception_clear( &ex );
+ case clicked_timeline:
+ {
+ /* if a movie is loaded */
+ if( p_md )
+ {
+ int64_t f_length;
+ f_length = libvlc_media_player_get_length( p_md ) / 100;
+
+ f_length = (float)f_length *
+ ( ((float)i_xPos-4.0 ) / ( ((float)i_width-8.0)/100) );
+
+ libvlc_media_player_set_time( p_md, f_length );
+ }
+ }
+ break;
+
+ case clicked_Time:
+ {
+ /* Not implemented yet*/
+ }
+ break;
+
+ default: /* button_Unknown */
+ break;
}
- libvlc_media_instance_release( p_md );
}
Redraw( w, closure, event );
}
static void Resize ( Widget w, XtPointer closure, XEvent *event )
{
VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(closure);
+ Window control = p_plugin->getControlWindow();
const NPWindow& window = p_plugin->getWindow();
Window drawable = p_plugin->getVideoWindow();
Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display;
Window root_return, parent_return, * children_return;
Window base_window;
unsigned int i_nchildren;
+ unsigned int i_control_height, i_control_width;
+
+ if( p_plugin->b_toolbar )
+ {
+ p_plugin->getToolbarSize( &i_control_width, &i_control_height );
+ }
+ else
+ {
+ i_control_height = i_control_width = 0;
+ }
#ifdef X11_RESIZE_DEBUG
XWindowAttributes attr;
}
#endif /* X11_RESIZE_DEBUG */
- if( ! p_plugin->setSize(window.width, (window.height - p_plugin->i_control_height)) )
+ if( ! p_plugin->setSize(window.width, (window.height - i_control_height)) )
{
/* size already set */
return;
}
- i_ret = XResizeWindow( p_display, drawable, window.width, (window.height - p_plugin->i_control_height) );
+ i_ret = XResizeWindow( p_display, drawable,
+ window.width, (window.height - i_control_height) );
#ifdef X11_RESIZE_DEBUG
fprintf( stderr,
#endif /* X11_RESIZE_DEBUG */
i_ret = XResizeWindow( p_display, base_window,
- window.width, ( window.height - p_plugin->i_control_height ) );
+ window.width, ( window.height - i_control_height ) );
#ifdef X11_RESIZE_DEBUG
fprintf( stderr,
projects / vlc / blobdiff