Commit f4d3a3f4 authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Rémi Denis-Courmont

mozilla: cosmetics

parent 0de68291
/*****************************************************************************
* npolibvlc.cpp: official Javascript APIs
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2009 the VideoLAN team
*
* Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
* Jan Paul Dinger <jpd@m2x.nl>
*
* 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
......@@ -914,12 +915,10 @@ LibvlcMessagesNPObject::invoke(int index, const NPVariant *args,
return INVOKERESULT_GENERIC_ERROR;
}
/*
** implementation of libvlc message object
*/
LibvlcLogNPObject::~LibvlcLogNPObject()
{
if( isValid() )
......@@ -1133,7 +1132,6 @@ LibvlcPlaylistItemsNPObject::invoke(int index, const NPVariant *args,
** implementation of libvlc playlist object
*/
LibvlcPlaylistNPObject::~LibvlcPlaylistNPObject()
{
if( isValid() )
......@@ -1311,7 +1309,7 @@ LibvlcPlaylistNPObject::invoke(int index, const NPVariant *args,
}
else
{
free(url);
free(url);
free(name);
return INVOKERESULT_INVALID_VALUE;
}
......
......@@ -474,7 +474,6 @@ int VlcPlugin::player_has_vout( libvlc_exception_t *ex )
return r;
}
/*****************************************************************************
* VlcPlugin methods
*****************************************************************************/
......@@ -863,8 +862,6 @@ void VlcPlugin::redrawToolbar()
dst_y - (p_timeline->height >> 1),
(window.width-(dst_x+BTN_SPACE)), p_timeline->height );
/* get movie position in % */
if( playlist_isplaying(&ex) )
{
......@@ -884,15 +881,16 @@ 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);
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;
......
/*****************************************************************************
* vlcplugin.h: a VLC plugin for Mozilla
*****************************************************************************
* Copyright (C) 2002-2008 the VideoLAN team
* Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Damien Fouilleul <damienf@videolan.org>
* Jean-Paul Saman <jpsaman@videolan.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
......@@ -92,7 +92,7 @@ public:
{
if( !libvlc_media_player )
{
libvlc_exception_raise(ex,"null mediaplayer");
libvlc_exception_raise(ex,"no mediaplayer");
}
return libvlc_media_player;
}
......@@ -270,6 +270,4 @@ private:
/* XSPF */ \
"application/xspf+xml:xspf:Playlist xspf;"
#endif
/*****************************************************************************
* vlcshell.cpp: a VLC plugin for Mozilla
*****************************************************************************
* Copyright (C) 2002-2008 the VideoLAN team
* Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -410,7 +410,8 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
/* 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;
......@@ -655,7 +656,6 @@ void NPP_URLNotify( NPP instance, const char* url,
\*********************************************/
}
void NPP_Print( NPP instance, NPPrint* printInfo )
{
if( printInfo == NULL )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment