[vlc-devel] commit: Cleanup mozilla plugin (Jean-Paul Saman )
git version control
git at videolan.org
Sun Jun 14 20:09:10 CEST 2009
vlc | branch: 1.0-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Sun Jun 14 00:15:15 2009 +0200| [be262960c031fbab9e2600969b08e516f20b6679] | committer: Jean-Paul Saman
Cleanup mozilla plugin
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be262960c031fbab9e2600969b08e516f20b6679
---
projects/mozilla/control/nporuntime.h | 2 +-
projects/mozilla/vlcplugin.cpp | 13 +++++++------
projects/mozilla/vlcplugin.h | 2 +-
projects/mozilla/vlcshell.cpp | 21 ++++++---------------
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/projects/mozilla/control/nporuntime.h b/projects/mozilla/control/nporuntime.h
index ad3c400..2ac525d 100644
--- a/projects/mozilla/control/nporuntime.h
+++ b/projects/mozilla/control/nporuntime.h
@@ -129,7 +129,7 @@ protected:
bool isPluginRunning()
{
- return _instance->pdata;
+ return (_instance->pdata != NULL);
}
template<class T> T *getPrivate()
{
diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index ed968bf..79b7ed4 100644
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -216,7 +216,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
** 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) )
{
@@ -236,7 +236,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
{
NPString &location = NPVARIANT_TO_STRING(result);
- psz_baseURL = static_cast<char*>(malloc(location.utf8length+1));
+ psz_baseURL = (char *) malloc(location.utf8length+1);
if( psz_baseURL )
{
strncpy(psz_baseURL, location.utf8characters, location.utf8length);
@@ -266,6 +266,7 @@ VlcPlugin::~VlcPlugin()
{
free(psz_baseURL);
free(psz_target);
+
if( libvlc_media_player )
libvlc_media_player_release( libvlc_media_player );
if( libvlc_media_list )
@@ -420,9 +421,9 @@ int VlcPlugin::get_fullscreen( libvlc_exception_t *ex )
return r;
}
-int VlcPlugin::player_has_vout( libvlc_exception_t *ex )
+bool VlcPlugin::player_has_vout( libvlc_exception_t *ex )
{
- int r = 0;
+ bool r = false;
if( playlist_isplaying(ex) )
r = libvlc_media_player_has_vout(libvlc_media_player, ex);
return r;
@@ -469,7 +470,7 @@ relativeurl:
if( psz_baseURL )
{
size_t baseLen = strlen(psz_baseURL);
- char *href = static_cast<char*>(malloc(baseLen+strlen(url)+1));
+ char *href = (char *) malloc(baseLen+strlen(url)+1);
if( href )
{
/* prepend base URL */
@@ -514,7 +515,7 @@ relativeurl:
if( '/' != *href )
{
/* baseURL is not an absolute path */
- free(href);
+ free(href);
return NULL;
}
pathstart = href;
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 97a9dea..99058f4 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -193,7 +193,7 @@ public:
void set_fullscreen( int, libvlc_exception_t * );
int get_fullscreen( libvlc_exception_t * );
- int player_has_vout( libvlc_exception_t * );
+ bool player_has_vout( libvlc_exception_t * );
private:
bool playlist_select(int,libvlc_exception_t *);
diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index 151c615..35aa571 100644
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -52,7 +52,7 @@
/*****************************************************************************
* 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 );
@@ -201,20 +201,11 @@ int16 NPP_HandleEvent( NPP instance, void * event )
const NPWindow& npwindow = p_plugin->getWindow();
if( npwindow.window )
{
- int hasVout = FALSE;
+ bool hasVout = false;
if( p_plugin->playlist_isplaying(&ex) )
{
hasVout = p_plugin->player_has_vout(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_plugin->getMD(&ex), &area, NULL);
- }
}
libvlc_exception_clear(&ex);
@@ -344,7 +335,7 @@ NPError NPP_Destroy( NPP instance, NPSavedData** save )
NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
-#if defined(XP_UNIX) && !defined(__APPLE__)
+#if defined(XP_UNIX)
Window control;
unsigned int i_control_height = 0, i_control_width = 0;
#endif
@@ -362,7 +353,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
return NPERR_NO_ERROR;
}
-#if defined(XP_UNIX) && !defined(__APPLE__)
+#if defined(XP_UNIX)
control = p_plugin->getControlWindow();
#endif
@@ -484,7 +475,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
}
#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
*/
@@ -771,7 +762,7 @@ static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpa
/******************************************************************************
* 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);
More information about the vlc-devel
mailing list