Commit ae059a3c authored by Laurent Aimar's avatar Laurent Aimar

Pass vout_thread_t to releaseVideo.

parent b4302875
...@@ -686,7 +686,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, ...@@ -686,7 +686,7 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
return ret; return ret;
} }
void MainInterface::releaseVideo( void *p_win ) void MainInterface::releaseVideo( vout_thread_t *p_vout, void *p_win )
{ {
emit askReleaseVideo( p_win ); emit askReleaseVideo( p_win );
} }
......
...@@ -73,8 +73,9 @@ public: ...@@ -73,8 +73,9 @@ public:
void *requestVideo( vout_thread_t *p_nvout, int *pi_x, void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width, int *pi_y, unsigned int *pi_width,
unsigned int *pi_height ); unsigned int *pi_height );
void releaseVideo( void * ); void releaseVideo( vout_thread_t *, void * );
int controlVideo( void *p_window, int i_query, va_list args ); int controlVideo( void *p_window, int i_query, va_list args );
void requestLayoutUpdate(); void requestLayoutUpdate();
/* Getters */ /* Getters */
......
...@@ -523,6 +523,6 @@ static void WindowClose (vlc_object_t *obj) ...@@ -523,6 +523,6 @@ static void WindowClose (vlc_object_t *obj)
QMutexLocker locker (&windowLock); QMutexLocker locker (&windowLock);
if (!miP->isNull ()) if (!miP->isNull ())
(*miP)->releaseVideo (wnd->handle); (*miP)->releaseVideo( wnd->vout, wnd->handle );
delete miP; delete miP;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment