[PATCH] Fix typo (80 char per line), few comments added

Anthony Loiseau anthony.loiseau at gmail.com
Wed Mar 26 15:00:16 CET 2008


---
 projects/mozilla/control/npolibvlc.h |    2 +-
 projects/mozilla/vlcplugin.cpp       |   12 +++++++++---
 projects/mozilla/vlcshell.cpp        |    9 ++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/projects/mozilla/control/npolibvlc.h b/projects/mozilla/control/npolibvlc.h
index 2f396ba..c471462 100644
--- a/projects/mozilla/control/npolibvlc.h
+++ b/projects/mozilla/control/npolibvlc.h
@@ -226,7 +226,7 @@ protected:
     LibvlcPlaylistNPObject(NPP instance, const NPClass *aClass) :
     RuntimeNPObject(instance, aClass),
     playlistItemsObj(NULL) {};
-    
+
     virtual ~LibvlcPlaylistNPObject();
 
     static const int propertyCount;
diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index 67dbccb..c4b1f50 100644
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -210,7 +210,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
                 psz_baseURL = new char[location.utf8length+1];
                 if( psz_baseURL )
                 {
-                    strncpy(psz_baseURL, location.utf8characters, location.utf8length);
+                    strncpy( psz_baseURL, location.utf8characters,
+                             location.utf8length );
                     psz_baseURL[location.utf8length] = '\0';
                 }
             }
@@ -268,7 +269,8 @@ char *VlcPlugin::getAbsoluteURL(const char *url)
                        || ('-' == c)
                        || ('+' == c)
                        || ('.' == c)
-                       || ('/' == c)) ) /* VLC uses / to allow user to specify a demuxer */
+                       || ('/' == c)) )
+                        /* VLC uses / to allow user to specify a demuxer */
                         // not valid protocol header, assume relative URL
                         goto relativeurl;
                     ++start;
@@ -556,10 +558,11 @@ void VlcPlugin::redrawToolbar()
     gcv.foreground = WhitePixel( p_display, 0 );
     XChangeGC( p_display, gc, GCForeground, &gcv );
 
+
     /* position icons */
     dst_x = 4; dst_y = 4;
 
-    fprintf( stderr, ">>>>>> is playing = %d\n", i_playing );
+    /* "play/pause" button image */
     if( p_btnPause && (i_playing == 1) )
     {
         XPutImage( p_display, control, gc, p_btnPause, 0, 0, dst_x, dst_y,
@@ -574,6 +577,7 @@ void VlcPlugin::redrawToolbar()
     dst_x += BTN_SPACE + ( p_btnPlay ? p_btnPlay->width : 0 );
     dst_y = 4;
 
+    /* "stop" button image */
     if( p_btnStop )
         XPutImage( p_display, control, gc, p_btnStop, 0, 0, dst_x, dst_y,
                    p_btnStop->width, p_btnStop->height );
@@ -588,6 +592,7 @@ void VlcPlugin::redrawToolbar()
     dst_x += BTN_SPACE + ( p_btnFullscreen ? p_btnFullscreen->width : 0 );
     dst_y = 4;
 
+    /* "mute/unmute" button image */
     if( p_btnUnmute && b_mute )
     {
         XPutImage( p_display, control, gc, p_btnUnmute, 0, 0, dst_x, dst_y,
@@ -605,6 +610,7 @@ void VlcPlugin::redrawToolbar()
         dst_y = 4;
     }
 
+    /* timeline */
     if( p_timeline )
         XPutImage( p_display, control, gc, p_timeline, 0, 0, dst_x, dst_y,
                    (window.width-(dst_x+BTN_SPACE)), p_timeline->height );
diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index 4d93ae9..ebde8d9 100644
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -69,7 +69,8 @@ static void Resize( Widget w, XtPointer closure, XEvent *event );
  *****************************************************************************/
 #ifdef XP_WIN
 
-static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar );
+static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg,
+                                WPARAM wpar, LPARAM lpar );
 
 #endif
 
@@ -750,9 +751,11 @@ void NPP_Print( NPP instance, NPPrint* printInfo )
  * Windows-only methods
  *****************************************************************************/
 #if XP_WIN
-static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpar )
+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));
+    VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*> \
+                                     (GetWindowLongPtr(p_hwnd, GWLP_USERDATA));
 
     switch( i_msg )
     {
-- 
1.5.4.2


--=-gN8rmrPxLMYcIphhtM/6
Content-Disposition: attachment; filename=0002-Add-toolbar-bool-RW-property-for-the-JS-API-fix-t.patch
Content-Type: application/mbox; name=0002-Add-toolbar-bool-RW-property-for-the-JS-API-fix-t.patch
Content-Transfer-Encoding: 7bit



More information about the vlc-devel mailing list