From: Laurent Aimar <fenrir@videolan.org>
Date: Tue, 15 Jul 2008 17:57:44 +0000 (+0200)
Subject: Pass vout_thread_t to releaseVideo.
X-Git-Tag: 0.9.0-test3~430
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ae059a3c9775c987ddd78b0319c6721a836f1319;p=vlc

Pass vout_thread_t to releaseVideo.
---

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 278da48ab7..5692d92f78 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -686,7 +686,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
     return ret;
 }
 
-void MainInterface::releaseVideo( void *p_win )
+void MainInterface::releaseVideo( vout_thread_t *p_vout, void *p_win )
 {
     emit askReleaseVideo( p_win );
 }
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index c23cc880af..fe44a46302 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -73,8 +73,9 @@ public:
     void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
                         int *pi_y, unsigned int *pi_width,
                         unsigned int *pi_height );
-    void releaseVideo( void * );
+    void releaseVideo( vout_thread_t *, void * );
     int controlVideo( void *p_window, int i_query, va_list args );
+
     void requestLayoutUpdate();
 
     /* Getters */
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 2794999145..2790451111 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -523,6 +523,6 @@ static void WindowClose (vlc_object_t *obj)
     QMutexLocker locker (&windowLock);
 
     if (!miP->isNull ())
-        (*miP)->releaseVideo (wnd->handle);
+        (*miP)->releaseVideo( wnd->vout, wnd->handle );
     delete miP;
 }