Commit b95136f6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove useless parameter

parent 62fd975c
...@@ -144,7 +144,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h ) ...@@ -144,7 +144,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
updateGeometry(); // Needed for deinterlace updateGeometry(); // Needed for deinterlace
} }
void VideoWidget::release( void *p_win ) void VideoWidget::release( void )
{ {
msg_Dbg( p_intf, "Video is not needed anymore" ); msg_Dbg( p_intf, "Video is not needed anymore" );
p_vout = NULL; p_vout = NULL;
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
void *request( vout_thread_t *, int *, int *, void *request( vout_thread_t *, int *, int *,
unsigned int *, unsigned int * ); unsigned int *, unsigned int * );
void release( void * ); void release( void );
int control( void *, int, va_list ); int control( void *, int, va_list );
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
......
...@@ -206,8 +206,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -206,8 +206,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* VideoWidget connects to avoid different threads speaking to each other */ /* VideoWidget connects to avoid different threads speaking to each other */
CONNECT( this, askReleaseVideo( void * ), CONNECT( this, askReleaseVideo( void ),
this, releaseVideoSlot( void * ) ); this, releaseVideoSlot( void ) );
if( videoWidget ) if( videoWidget )
CONNECT( this, askVideoToResize( unsigned int, unsigned int ), CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
videoWidget, SetSizing( unsigned int, unsigned int ) ); videoWidget, SetSizing( unsigned int, unsigned int ) );
...@@ -650,17 +650,16 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, ...@@ -650,17 +650,16 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
} }
/* Call from the WindowClose function */ /* Call from the WindowClose function */
void MainInterface::releaseVideo( void *p_win ) void MainInterface::releaseVideo( void )
{ {
if( fullscreenControls ) fullscreenControls->detachVout(); if( fullscreenControls ) fullscreenControls->detachVout();
if( p_win ) emit askReleaseVideo( );
emit askReleaseVideo( p_win );
} }
/* Function that is CONNECTED to the previous emit */ /* Function that is CONNECTED to the previous emit */
void MainInterface::releaseVideoSlot( void *p_win ) void MainInterface::releaseVideoSlot( void )
{ {
videoWidget->release( p_win ); videoWidget->release( );
if( bgWasVisible ) if( bgWasVisible )
{ {
......
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ 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( void );
int controlVideo( void *p_window, int i_query, va_list args ); int controlVideo( void *p_window, int i_query, va_list args );
/* Getters */ /* Getters */
...@@ -159,7 +159,7 @@ public slots: ...@@ -159,7 +159,7 @@ public slots:
void toggleFSC(); void toggleFSC();
/* Manage the Video Functions from the vout threads */ /* Manage the Video Functions from the vout threads */
void releaseVideoSlot( void * ); void releaseVideoSlot( void );
private slots: private slots:
void debug(); void debug();
...@@ -177,7 +177,7 @@ private slots: ...@@ -177,7 +177,7 @@ private slots:
void showSpeedMenu( QPoint ); void showSpeedMenu( QPoint );
void updateRecentsMenu(); void updateRecentsMenu();
signals: signals:
void askReleaseVideo( void * ); void askReleaseVideo( );
void askVideoToResize( unsigned int, unsigned int ); void askVideoToResize( unsigned int, unsigned int );
void askVideoToToggle(); void askVideoToToggle();
void askBgWidgetToToggle(); void askBgWidgetToToggle();
......
...@@ -557,5 +557,5 @@ static void WindowClose (vlc_object_t *obj) ...@@ -557,5 +557,5 @@ static void WindowClose (vlc_object_t *obj)
QMutexLocker locker (&iface.lock); QMutexLocker locker (&iface.lock);
msg_Dbg (obj, "releasing video..."); msg_Dbg (obj, "releasing video...");
p_mi->releaseVideo (wnd->handle); p_mi->releaseVideo ();
} }
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