# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-int E_(Open) ( vlc_object_t * );
-void E_(Close)( vlc_object_t * );
+int Open ( vlc_object_t * );
+void Close( vlc_object_t * );
static void RunIntf( intf_thread_t *p_intf );
static int InitThread( intf_thread_t *p_intf );
static int MouseEvent( vlc_object_t *, char const *,
vlc_module_begin();
set_shortname( "Showintf" );
add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true );
- set_description( _("Show interface with mouse") );
+ set_description( N_("Show interface with mouse") );
set_capability( "interface", 0 );
- set_callbacks( E_(Open), E_(Close) );
+ set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
* Open: initialize interface
*****************************************************************************/
-int E_(Open)( vlc_object_t *p_this )
+int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
/*****************************************************************************
* Close: destroy interface
*****************************************************************************/
-void E_(Close)( vlc_object_t *p_this )
+void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
/* Notify the interfaces */
if( p_intf->p_sys->b_triggered )
{
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_SetBool( p_playlist, "intf-show", true );
- vlc_object_release( p_playlist );
+ var_SetBool( p_intf->p_libvlc, "intf-show", true );
p_intf->p_sys->b_triggered = false;
}
/* Take care of the video output */
- if( p_intf->p_sys->p_vout && p_intf->p_sys->p_vout->b_die )
+ if( p_intf->p_sys->p_vout && !vlc_object_alive (p_intf->p_sys->p_vout) )
{
var_DelCallback( p_intf->p_sys->p_vout, "mouse-moved",
MouseEvent, p_intf );