[vlc-commits] Remove commented out code and minor cosmetics

Ludovic Fauvet git at videolan.org
Sat Dec 22 04:47:51 CET 2012


npapi-vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Sat Dec 22 04:35:25 2012 +0100| [7db2f48fdad63e0fdb7e10e9e5328b541dbb92f6] | committer: Ludovic Fauvet

Remove commented out code and minor cosmetics

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=7db2f48fdad63e0fdb7e10e9e5328b541dbb92f6
---

 npapi/vlcwindowless_xcb.cpp |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/npapi/vlcwindowless_xcb.cpp b/npapi/vlcwindowless_xcb.cpp
index a60f821..7af93dd 100644
--- a/npapi/vlcwindowless_xcb.cpp
+++ b/npapi/vlcwindowless_xcb.cpp
@@ -25,7 +25,6 @@
 
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
-
 #include <cstring>
 #include <cstdlib>
 
@@ -93,7 +92,7 @@ bool VlcWindowlessXCB::handle_event(void *event)
 
         xcb_gcontext_t gc;
         xcb_void_cookie_t cookie;
-        xcb_generic_error_t* err;
+        xcb_generic_error_t *err;
         XGraphicsExposeEvent *xgeevent = reinterpret_cast<XGraphicsExposeEvent *>(xevent);
 
         /* Something went wrong during initialization */
@@ -110,18 +109,6 @@ bool VlcWindowlessXCB::handle_event(void *event)
         int left = (npwindow.width  - m_media_width)  / 2;
         int top  = (npwindow.height - m_media_height) / 2;
 
-        /* TODO Expose:
-
-        xcb_pixmap_t pmap = xcb_generate_id(m_conn);
-        xcb_create_pixmap(m_conn, 24, pmap, xgeevent->drawable, m_media_width, m_media_height);
-
-        gc = xcb_generate_id(m_conn);
-        xcb_create_gc(m_conn, gc, xgeevent->drawable, 0, NULL);
-        xcb_image_put(m_conn, pmap, gc, image, left, top, 0);
-        xcb_copy_area(m_conn, pmap, xgeevent->drawable, gc, 0, 0, 0, 0, m_media_width, m_media_height);
-        */
-
-        /* Push the frame in X11 */
         gc = xcb_generate_id(m_conn);
         xcb_create_gc(m_conn, gc, xgeevent->drawable, 0, NULL);
 
@@ -136,7 +123,7 @@ bool VlcWindowlessXCB::handle_event(void *event)
                     left, top,
                     0, 24,
                     m_media_width * m_media_height * 4,
-                    (const uint8_t*)&m_frame_buf[0]);
+                    (const uint8_t *)&m_frame_buf[0]);
 
         if (err = xcb_request_check(m_conn, cookie))
         {



More information about the vlc-commits mailing list