# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_interface.h>
struct intf_sys_t
{
xosd * p_osd; /* libxosd handle */
- vlc_bool_t b_need_update; /* Update display ? */
+ bool b_need_update; /* Update display ? */
};
#define MAX_LINE_LENGTH 256
vlc_module_begin();
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_description( _("XOSD interface") );
+ set_description( N_("XOSD interface") );
set_shortname( "XOSD" );
- add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, VLC_TRUE );
- add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, VLC_TRUE );
+ add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, true );
+ add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, true );
add_integer( "xosd-shadow-offset", 2, NULL,
- SHD_OFS_TEXT, SHD_OFS_LONGTEXT, VLC_TRUE );
+ SHD_OFS_TEXT, SHD_OFS_LONGTEXT, true );
add_string( "xosd-font",
"-adobe-helvetica-bold-r-normal-*-*-160-*-*-p-*-iso8859-1",
- NULL, FONT_TEXT, FONT_LONGTEXT, VLC_TRUE );
+ NULL, FONT_TEXT, FONT_LONGTEXT, true );
add_string( "xosd-colour", "LawnGreen",
- NULL, COLOUR_TEXT, COLOUR_LONGTEXT, VLC_TRUE );
+ NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true );
set_capability( "interface", 10 );
set_callbacks( Open, Close );
vlc_module_end();
p_intf->pf_run = Run;
- p_intf->p_sys->b_need_update = VLC_TRUE;
+ p_intf->p_sys->b_need_update = true;
return VLC_SUCCESS;
}
char psz_duration[MSTRTIME_MAX_SIZE+2];
char *psz_display = NULL;
- while( !p_intf->b_die )
+ while( vlc_object_alive (p_intf) )
{
- if( p_intf->p_sys->b_need_update == VLC_TRUE )
+ if( p_intf->p_sys->b_need_update == true )
{
- p_intf->p_sys->b_need_update = VLC_FALSE;
+ p_intf->p_sys->b_need_update = false;
p_playlist = pl_Yield( p_intf );
if( playlist_IsEmpty( p_playlist ) )
{
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
continue;
}
- if( psz_display )
- {
- free( psz_display );
- psz_display = NULL;
- }
+ free( psz_display );
+ psz_display = NULL;
if( p_playlist->status.i_status == PLAYLIST_STOPPED )
{
psz_display = strdup(_("Stop"));
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
}
else if( p_playlist->status.i_status == PLAYLIST_PAUSED )
{
psz_display = strdup(_("Pause"));
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
}
else
{
p_item = p_playlist->status.p_item;
p_input = p_item->p_input;
+
+ pl_Release( p_playlist );
if( !p_item )
- {
- vlc_object_release( p_playlist );
continue;
- }
-
- vlc_object_release( p_playlist );
mtime_t i_duration = input_item_GetDuration( p_input );
if( i_duration != -1 )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
- p_intf->p_sys->b_need_update = VLC_TRUE;
+ p_intf->p_sys->b_need_update = true;
return VLC_SUCCESS;
}