#include "vlc_vod.h"
#include "vlc_tls.h"
#include "vlc_xml.h"
+#include "vlc_osd.h"
/*****************************************************************************
* Local prototypes
static vlc_list_t * NewList ( int );
static void ListReplace ( vlc_list_t *, vlc_object_t *, int );
-static void ListAppend ( vlc_list_t *, vlc_object_t * );
+/*static void ListAppend ( vlc_list_t *, vlc_object_t * );*/
static int CountChildren ( vlc_object_t *, int );
static void ListChildren ( vlc_list_t *, vlc_object_t *, int );
i_size = sizeof( announce_handler_t );
psz_type = "announce handler";
break;
+ case VLC_OBJECT_OSDMENU:
+ i_size = sizeof( osd_menu_t );
+ psz_type = "osd menu";
+ break;
+ case VLC_OBJECT_STATS:
+ i_size = sizeof( stats_handler_t );
+ psz_type = "statistics";
+ break;
default:
i_size = i_type > 0
? i_type > (int)sizeof(vlc_object_t)
/* Don't warn immediately ... 100ms seems OK */
if( i_delay == 2 )
{
- msg_Warn( p_this, "refcount is %i, delaying before deletion",
- p_this->i_refcount );
+ msg_Warn( p_this,
+ "refcount is %i, delaying before deletion (id=%d,type=%d)",
+ p_this->i_refcount, p_this->i_object_id,
+ p_this->i_object_type );
}
- else if( i_delay == 12 )
+ else if( i_delay == 10 )
{
- msg_Err( p_this, "refcount is %i, I have a bad feeling about this",
- p_this->i_refcount );
+ msg_Err( p_this,
+ "refcount is %i, delaying again (id=%d,type=%d)",
+ p_this->i_refcount, p_this->i_object_id,
+ p_this->i_object_type );
}
- else if( i_delay == 42 )
+ else if( i_delay == 20 )
{
- msg_Err( p_this, "we waited too long, cancelling destruction" );
+ msg_Err( p_this,
+ "we waited too long, cancelling destruction (id=%d,type=%d)",
+ p_this->i_object_id, p_this->i_object_type );
return;
}
return;
}
-static void ListAppend( vlc_list_t *p_list, vlc_object_t *p_object )
+/*static void ListAppend( vlc_list_t *p_list, vlc_object_t *p_object )
{
if( p_list == NULL )
{
p_list->i_count++;
return;
-}
+}*/
static int CountChildren( vlc_object_t *p_this, int i_type )
{