Pass vout_thread_t to releaseVideo.

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 278da48ab710c3780dcf0a4c69bf0a88885920bf..5692d92f78aa902f459565f0c6d21c921568d267 100644 (file)
--- 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 c23cc880afffe90ded122f5e022e590433c868f6..fe44a46302de8c5b6f005186db3a4decd097d732 100644 (file)
--- 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 2794999145f44a8743af3a58a630072d2b91c77b..27904511113ca30c6a32e39ba78f33cf71fba97f 100644 (file)
--- 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;
 }