[vlc-devel] commit: Another compile fix ( Rémi Denis-Courmont )

git version control git at videolan.org
Fri Jun 20 20:00:48 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Fri Jun 20 21:02:48 2008 +0300| [686ad4c9b1a2c4f7dd61a73e47a8522f6bc07cb7]

Another compile fix

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

 modules/gui/skins2/src/skin_main.cpp |    2 +-
 modules/gui/skins2/src/vlcproc.hpp   |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index cf55bb5..b955c2f 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -272,7 +272,7 @@ static int WindowOpen( vlc_object_t *p_this )
                                        &pWnd->pos_x, &pWnd->pos_y,
                                        &pWnd->width, &pWnd->height );
     pWnd->p_private = pIntf;
-    pWnd->control = &VlcProc::controlWindow
+    pWnd->control = &VlcProc::controlWindow;
     return VLC_SUCCESS;
 }
 
diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index 1e4fac2..8db9b07 100644
--- a/modules/gui/skins2/src/vlcproc.hpp
+++ b/modules/gui/skins2/src/vlcproc.hpp
@@ -209,6 +209,7 @@ class VlcProc: public SkinObject
                                   vlc_value_t oldVal, vlc_value_t newVal,
                                   void *pParam );
 
+    public: /* FIXME: these used to be private for a reason */
         /// Callback to request a vout window
         static void *getWindow( intf_thread_t *pIntf, vout_thread_t *pVout,
                                 int *pXHint, int *pYHint,
@@ -221,6 +222,7 @@ class VlcProc: public SkinObject
         /// Callback to change a vout window
         static int controlWindow( struct vout_window_t *pWnd,
                                   int query, va_list args );
+    private: /* end of FIXME */
 
         /// Callback for equalizer-bands variable
         static int onEqBandsChange( vlc_object_t *pObj, const char *pVariable,




More information about the vlc-devel mailing list