Commit 4667e2d7 authored by gbazin's avatar gbazin
Browse files

* skins2/src/vlcproc.cpp: a few cleanup fixes.

* wxwindows/*: a few cleanup fixes.
parent 3992ea9f
...@@ -56,8 +56,8 @@ void VlcProc::destroy( intf_thread_t *pIntf ) ...@@ -56,8 +56,8 @@ void VlcProc::destroy( intf_thread_t *pIntf )
} }
VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ), m_pVoutWindow( NULL ), VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
m_pVout( NULL ) m_pVoutWindow( NULL ), m_pVout( NULL )
{ {
// Create a timer to poll the status of the vlc // Create a timer to poll the status of the vlc
OSFactory *pOsFactory = OSFactory::instance( pIntf ); OSFactory *pOsFactory = OSFactory::instance( pIntf );
...@@ -117,6 +117,18 @@ VlcProc::~VlcProc() ...@@ -117,6 +117,18 @@ VlcProc::~VlcProc()
{ {
vlc_object_release( getIntf()->p_sys->p_input ); vlc_object_release( getIntf()->p_sys->p_input );
} }
// Callbacks for vout requests
getIntf()->pf_request_window = NULL;
getIntf()->pf_release_window = NULL;
getIntf()->pf_control_window = NULL;
var_DelCallback( getIntf()->p_sys->p_playlist, "intf-change",
onIntfChange, this );
var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-current",
onPlaylistChange, this );
var_DelCallback( getIntf()->p_sys->p_playlist, "item-change",
onItemChange, this );
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* bookmarks.cpp : wxWindows plugin for vlc * bookmarks.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: bookmarks.cpp 6961 2004-03-05 17:34:23Z sam $ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -167,9 +167,8 @@ BookmarksDialog::~BookmarksDialog() ...@@ -167,9 +167,8 @@ BookmarksDialog::~BookmarksDialog()
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist ) if( p_playlist )
{ {
/* Some global changes happened -> Rebuild all */ var_DelCallback( p_playlist, "playlist-current",
var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this ); PlaylistChanged, this );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
......
...@@ -130,6 +130,10 @@ VideoWindow::~VideoWindow() ...@@ -130,6 +130,10 @@ VideoWindow::~VideoWindow()
if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS ) if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS )
vout_Control( p_vout, VOUT_CLOSE ); vout_Control( p_vout, VOUT_CLOSE );
} }
p_intf->pf_request_window = NULL;
p_intf->pf_release_window = NULL;
p_intf->pf_control_window = NULL;
vlc_mutex_unlock( &lock ); vlc_mutex_unlock( &lock );
vlc_mutex_destroy( &lock ); vlc_mutex_destroy( &lock );
......
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