Commit f63b74c6 authored by Christophe Mutricy's avatar Christophe Mutricy

qt4.cpp: Put it at a better place, only under X11, remove debug

parent 434a7e5e
......@@ -68,6 +68,13 @@ static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
p_intf->pf_run = Run;
#if defined HAVE_GETENV && defined Q_WS_X11
if( !getenv( "DISPLAY" ) )
{
msg_Err(p_intf, "no X server");
return VLC_EGENERIC;
}
#endif
p_intf->p_sys = (intf_sys_t *)malloc(sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
{
......@@ -75,13 +82,6 @@ static int Open( vlc_object_t *p_this )
return VLC_ENOMEM;
}
memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
#ifdef HAVE_GETENV
if( !getenv( "DISPLAY" ) )
{
msg_Err(p_intf, "no X server");
return VLC_EGENERIC;
}
#endif
p_intf->p_sys->p_playlist = pl_Yield( p_intf );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
......@@ -131,9 +131,7 @@ static void Init( intf_thread_t *p_intf )
char *argv[] = { "" };
int argc = 1;
Q_INIT_RESOURCE( vlc );
msg_Err(p_intf,"before Qapplication constructor");
QApplication *app = new QApplication( argc, argv , true );
msg_Err(p_intf,"after constructoe");
app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app;
......
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