Fix function name clash

[vlc] / modules / gui / qt4 / qt4.cpp

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 4255a2b0cf6e2064ec54009b6e674a5322c18e32..41bdd26d395d6065b0b619c5af880a3a9466daf3 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -54,8 +54,8 @@
 static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 static int  OpenDialogs  ( vlc_object_t * );
-static int  OpenWindow   ( vlc_object_t * );
-static void CloseWindow  ( vlc_object_t * );
+static int  WindowOpen   ( vlc_object_t * );
+static void WindowClose  ( vlc_object_t * );
 static void Run          ( intf_thread_t * );
 static void Init         ( intf_thread_t * );
 static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
@@ -210,7 +210,7 @@ vlc_module_begin();
 
     add_submodule();
         set_capability( "vout window", 50 );
-        set_callbacks( OpenWindow, CloseWindow );
+        set_callbacks( WindowOpen, WindowClose );
 vlc_module_end();
 
 /*****************************************************************************
@@ -333,6 +333,8 @@ static void Init( intf_thread_t *p_intf )
     /* Initialize timers and the Dialog Provider */
     DialogsProvider::getInstance( p_intf );
 
+    QPointer<MainInterface> *miP = NULL;
+
     /* Create the normal interface in non-DP mode */
     if( !p_intf->pf_show_dialog )
     {
@@ -341,7 +343,8 @@ static void Init( intf_thread_t *p_intf )
         p_mi->show(); */
         p_intf->p_sys->b_isDialogProvider = false;
 
-        val.p_address = new QPointer<MainInterface> (p_intf->p_sys->p_mi);
+        miP = new QPointer<MainInterface> (p_intf->p_sys->p_mi);
+        val.p_address = miP;
         QMutexLocker locker (&windowLock);
         var_Set (p_intf, "window_widget", val);
         windowWait.wakeAll ();
@@ -403,13 +406,13 @@ static void Init( intf_thread_t *p_intf )
 
     /* And quit */
 
-    windowLock.lock ();
-    var_Get (p_intf, "window_widget", &val);
-    if (val.p_address)
-        delete (QPointer<MainInterface> *)val.p_address;
-    val.p_address = NULL;
-    var_Set (p_intf, "window_widget", val);
-    windowLock.unlock();
+    if (miP)
+    {
+        QMutexLocker locker (&windowLock);
+        val.p_address = NULL;
+        var_Set (p_intf, "window_widget", val);
+        delete miP;
+    }
 
     /* Destroy first the main interface because it is connected to some slots
        in the MainInputManager */
@@ -458,9 +461,9 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
  */
 #include <vlc_window.h>
 
-static int ControlWindow (vout_window_t *, int, va_list);
+static int WindowControl (vout_window_t *, int, va_list);
 
-static int OpenWindow (vlc_object_t *obj)
+static int WindowOpen (vlc_object_t *obj)
 {
     vout_window_t *wnd = (vout_window_t *)obj;
 
@@ -486,9 +489,7 @@ static int OpenWindow (vlc_object_t *obj)
 
     msg_Dbg (obj, "requesting window...");
     QPointer<MainInterface> *miP = (QPointer<MainInterface> *)ptrval.p_address;
-    ptrval.p_address = NULL;
-    /* take ownership */
-    var_Set (intf, "window_widget", ptrval);
+    miP = new QPointer<MainInterface> (*miP); /* create our own copy */
     vlc_object_release (intf);
 
     if (miP->isNull ())
@@ -503,12 +504,12 @@ static int OpenWindow (vlc_object_t *obj)
     wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
                                         &wnd->width, &wnd->height);
     windowLock.unlock ();
-    wnd->control = ControlWindow;
+    wnd->control = WindowControl;
     wnd->p_private = miP;
     return VLC_SUCCESS;
 }
 
-static int ControlWindow (vout_window_t *wnd, int query, va_list args)
+static int WindowControl (vout_window_t *wnd, int query, va_list args)
 {
     QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
     QMutexLocker locker (&windowLock);
@@ -518,7 +519,7 @@ static int ControlWindow (vout_window_t *wnd, int query, va_list args)
     return (*miP)->controlVideo (wnd->handle, query, args);
 }
 
-static void CloseWindow (vlc_object_t *obj)
+static void WindowClose (vlc_object_t *obj)
 {
     vout_window_t *wnd = (vout_window_t *)obj;
     QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;