From: RĂ©mi Denis-Courmont Date: Mon, 2 Aug 2010 19:18:37 +0000 (+0300) Subject: Qt4: remove useless playlist pointer X-Git-Tag: 1.2.0-pre1~5579 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fb77c0f7df71bc228f6d60990a87ac2910e46992;p=vlc Qt4: remove useless playlist pointer --- diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 0e9ab8ea7c..de5d7964b1 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -338,7 +338,6 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t; p_intf->p_sys->b_isDialogProvider = isDialogProvider; p_sys->p_mi = NULL; - p_sys->p_playlist = pl_Get( p_intf ); /* */ #ifdef Q_WS_X11 @@ -496,7 +495,7 @@ static void *Thread( void *obj ) if( !p_intf->p_sys->b_isDialogProvider ) { RegisterIntf( (vlc_object_t *)p_intf ); - playlist_Play( p_intf->p_sys->p_playlist ); + playlist_Play( THEPL ); } #endif diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp index 577d43417f..6c42a73e57 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -71,13 +71,11 @@ struct intf_sys_t int i_screenHeight; /* Detection of Small screens */ - playlist_t *p_playlist; /* Core Playlist discussion */ - QString filepath; /* Last path used in dialogs */ }; -#define THEPL p_intf->p_sys->p_playlist +#define THEPL pl_Get(p_intf) #define QPL_LOCK playlist_Lock( THEPL ); #define QPL_UNLOCK playlist_Unlock( THEPL );