[vlc-devel] commit: Compile fixes (untested) ( Rémi Denis-Courmont )

git version control git at videolan.org
Fri Jun 20 19:53:22 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Fri Jun 20 20:55:22 2008 +0300| [b3c34d1580d3c9c5e39b1db8a9ef2844e80f5709]

Compile fixes (untested)

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

 modules/gui/skins2/src/skin_main.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index a994c7a..cf55bb5 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -31,6 +31,7 @@
 #include <vlc_input.h>
 #include <vlc_demux.h>
 #include <vlc_playlist.h>
+#include <vlc_window.h>
 
 #include "dialogs.hpp"
 #include "os_factory.hpp"
@@ -262,15 +263,15 @@ static int WindowOpen( vlc_object_t *p_this )
     intf_thread_t *pIntf = (intf_thread_t *)
         vlc_object_find_name( p_this, "skins2", FIND_ANYWHERE );
 
-    if( p_intf == NULL )
+    if( pIntf == NULL )
         return VLC_EGENERIC;
 
     /* FIXME: most probably not thread-safe,
      * albeit no worse than ever before */
-    pWind->handle = VlcProc::getWindow( pIntf, pWnd->vout,
-                                        &pWnd->pos_x, &pWnd->pos_y,
-                                        &pWnd->width, &pWnd->height );
-    pWnd->p_private = p_intf;
+    pWnd->handle = VlcProc::getWindow( pIntf, pWnd->vout,
+                                       &pWnd->pos_x, &pWnd->pos_y,
+                                       &pWnd->width, &pWnd->height );
+    pWnd->p_private = pIntf;
     pWnd->control = &VlcProc::controlWindow
     return VLC_SUCCESS;
 }




More information about the vlc-devel mailing list