p_sys->b_box_cleared = false;
p_sys->i_box_plidx = 0;
p_sys->i_box_bidx = 0;
- p_sys->p_sub = msg_Subscribe( p_intf );
+// FIXME p_sys->p_sub = msg_Subscribe( p_intf );
p_sys->b_color = var_CreateGetBool( p_intf, "color" );
p_sys->b_color_started = false;
/* Close the ncurses interface */
endwin();
- msg_Unsubscribe( p_intf, p_sys->p_sub );
+// FIXME msg_Unsubscribe( p_intf, p_sys->p_sub );
/* Restores initial verbose setting */
vlc_value_t val;
}
else if( p_sys->i_box_type == BOX_LOG )
{
+#warning Deprecated API
+#if 0
int i_line = 0;
int i_stop;
int i_start;
DrawBox( p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color );
+
i_start = p_intf->p_sys->p_sub->i_start;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
p_intf->p_sys->p_sub->i_start = i_stop;
vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
y = y_end;
+#endif
}
else if( p_sys->i_box_type == BOX_BROWSE )
{
/* Access to the playlist */
p_intf->p_sys->p_playlist = pl_Hold( p_intf );
/* Listen to the messages */
+<<<<<<< Updated upstream:modules/gui/qt4/qt4.cpp
//p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, NULL, NULL );
+=======
+ //p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+>>>>>>> Stashed changes:modules/gui/qt4/qt4.cpp
/* one settings to rule them all */
var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
p_intf->pf_run = Run;
// Suscribe to messages bank
+#if 0
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+#endif
p_intf->p_sys->p_input = NULL;
p_intf->p_sys->p_playlist = pl_Hold( p_intf );
{
msg_Err( p_intf, "cannot initialize OSFactory" );
vlc_object_release( p_intf->p_sys->p_playlist );
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
return VLC_EGENERIC;
}
if( AsyncQueue::instance( p_intf ) == NULL )
{
msg_Err( p_intf, "cannot initialize AsyncQueue" );
vlc_object_release( p_intf->p_sys->p_playlist );
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
return VLC_EGENERIC;
}
if( Interpreter::instance( p_intf ) == NULL )
{
msg_Err( p_intf, "cannot instanciate Interpreter" );
vlc_object_release( p_intf->p_sys->p_playlist );
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
return VLC_EGENERIC;
}
if( VarManager::instance( p_intf ) == NULL )
{
msg_Err( p_intf, "cannot instanciate VarManager" );
vlc_object_release( p_intf->p_sys->p_playlist );
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
return VLC_EGENERIC;
}
if( VlcProc::instance( p_intf ) == NULL )
{
msg_Err( p_intf, "cannot initialize VLCProc" );
vlc_object_release( p_intf->p_sys->p_playlist );
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
return VLC_EGENERIC;
}
Dialogs::instance( p_intf );
}
// Unsubscribe from messages bank
+#if 0
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+#endif
// Destroy structure
free( p_intf->p_sys );