[vlc-devel] commit: mozilla: cosmetics (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Mar  6 14:41:04 2009 +0100| [4e250dc9510d1ea8315321b95c117997a59fb9dc] | committer: Jean-Paul Saman 

mozilla: cosmetics

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4e250dc9510d1ea8315321b95c117997a59fb9dc
---

 projects/mozilla/control/npolibvlc.cpp |    8 +++-----
 projects/mozilla/vlcplugin.cpp         |    8 +++-----
 projects/mozilla/vlcplugin.h           |    8 +++-----
 projects/mozilla/vlcshell.cpp          |    6 +++---
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/projects/mozilla/control/npolibvlc.cpp b/projects/mozilla/control/npolibvlc.cpp
index 094c3a4..5baec6e 100644
--- a/projects/mozilla/control/npolibvlc.cpp
+++ b/projects/mozilla/control/npolibvlc.cpp
@@ -1,9 +1,10 @@
 /*****************************************************************************
  * npolibvlc.cpp: official Javascript APIs
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul at laposte.net>
+ *          Jan Paul Dinger <jpd at 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;
                     }
diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index 80c3a29..40ca4a2 100644
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -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;
 
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 39e84b8..403a727 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -1,12 +1,12 @@
 /*****************************************************************************
  * 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 at zoy.org>
  *          Damien Fouilleul <damienf at videolan.org>
- *         Jean-Paul Saman <jpsaman at videolan.org>
+ *          Jean-Paul Saman <jpsaman at 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
diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index 035af2f..f532e8a 100644
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * 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 at 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 )