/*****************************************************************************
* objects.c: vlc_object_t handling
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/**
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
+#include <vlc/input.h>
#ifdef HAVE_STDLIB_H
# include <stdlib.h> /* realloc() */
#endif
-#include "stream_control.h"
-#include "input_ext-intf.h"
-#include "input_ext-dec.h"
-
#include "vlc_video.h"
#include "video_output.h"
+#include "vlc_spu.h"
#include "audio_output.h"
#include "aout_internal.h"
#include "vlc_playlist.h"
#include "vlc_interface.h"
#include "vlc_codec.h"
+#include "vlc_filter.h"
#include "vlc_httpd.h"
#include "vlc_vlm.h"
+#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 );
void * __vlc_object_create( vlc_object_t *p_this, int i_type )
{
vlc_object_t * p_new;
- char * psz_type;
+ const char * psz_type;
size_t i_size;
switch( i_type )
{
case VLC_OBJECT_ROOT:
- i_size = sizeof(libvlc_t);
+ i_size = sizeof(libvlc_global_data_t);
psz_type = "root";
break;
- case VLC_OBJECT_VLC:
- i_size = sizeof(vlc_t);
- psz_type = "vlc";
+ case VLC_OBJECT_LIBVLC:
+ i_size = sizeof(libvlc_int_t);
+ psz_type = "libvlc";
break;
case VLC_OBJECT_MODULE:
i_size = sizeof(module_t);
break;
case VLC_OBJECT_DIALOGS:
i_size = sizeof(intf_thread_t);
- psz_type = "dialogs provider";
+ psz_type = "dialogs";
break;
case VLC_OBJECT_PLAYLIST:
i_size = sizeof(playlist_t);
psz_type = "playlist";
break;
+ case VLC_OBJECT_SD:
+ i_size = sizeof(services_discovery_t);
+ psz_type = "services discovery";
+ break;
case VLC_OBJECT_INPUT:
i_size = sizeof(input_thread_t);
psz_type = "input";
i_size = sizeof(demux_t);
psz_type = "demux";
break;
+ case VLC_OBJECT_STREAM:
+ i_size = sizeof(stream_t);
+ psz_type = "stream";
+ break;
case VLC_OBJECT_ACCESS:
i_size = sizeof(access_t);
psz_type = "access";
i_size = sizeof(encoder_t);
psz_type = "encoder";
break;
+ case VLC_OBJECT_FILTER:
+ i_size = sizeof(filter_t);
+ psz_type = "filter";
+ break;
case VLC_OBJECT_VOUT:
i_size = sizeof(vout_thread_t);
psz_type = "video output";
break;
+ case VLC_OBJECT_SPU:
+ i_size = sizeof(spu_t);
+ psz_type = "subpicture";
+ break;
case VLC_OBJECT_AOUT:
i_size = sizeof(aout_instance_t);
psz_type = "audio output";
break;
case VLC_OBJECT_HTTPD:
i_size = sizeof( httpd_t );
- psz_type = "http daemon";
+ psz_type = "http server";
+ break;
+ case VLC_OBJECT_HTTPD_HOST:
+ i_size = sizeof( httpd_host_t );
+ psz_type = "http server";
break;
case VLC_OBJECT_VLM:
i_size = sizeof( vlm_t );
psz_type = "vlm dameon";
break;
+ case VLC_OBJECT_VOD:
+ i_size = sizeof( vod_t );
+ psz_type = "vod server";
+ break;
+ case VLC_OBJECT_TLS:
+ i_size = sizeof( tls_t );
+ psz_type = "tls";
+ break;
+ case VLC_OBJECT_XML:
+ i_size = sizeof( xml_t );
+ psz_type = "xml";
+ break;
+ case VLC_OBJECT_OPENGL:
+ i_size = sizeof( vout_thread_t );
+ psz_type = "opengl";
+ break;
case VLC_OBJECT_ANNOUNCE:
i_size = sizeof( announce_handler_t );
- psz_type = "announce handler";
+ psz_type = "announce";
+ break;
+ case VLC_OBJECT_OSDMENU:
+ i_size = sizeof( osd_menu_t );
+ psz_type = "osd menu";
break;
default:
- i_size = i_type > 0
- ? i_type > (int)sizeof(vlc_object_t)
- ? i_type : (int)sizeof(vlc_object_t)
- : (int)sizeof(vlc_object_t);
+ i_size = i_type > (int)sizeof(vlc_object_t)
+ ? i_type : (int)sizeof(vlc_object_t);
i_type = VLC_OBJECT_GENERIC;
psz_type = "generic";
break;
else
{
p_new = malloc( i_size );
-
- if( !p_new )
- {
- return NULL;
- }
-
+ if( !p_new ) return NULL;
memset( p_new, 0, i_size );
}
p_new->b_error = VLC_FALSE;
p_new->b_dead = VLC_FALSE;
p_new->b_attached = VLC_FALSE;
+ p_new->b_force = VLC_FALSE;
+
+ p_new->psz_header = NULL;
+
+ p_new->i_flags = 0;
+ if( p_this->i_flags & OBJECT_FLAGS_NODBG )
+ p_new->i_flags |= OBJECT_FLAGS_NODBG;
+ if( p_this->i_flags & OBJECT_FLAGS_QUIET )
+ p_new->i_flags |= OBJECT_FLAGS_QUIET;
+ if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
+ p_new->i_flags |= OBJECT_FLAGS_NOINTERACT;
p_new->i_vars = 0;
p_new->p_vars = (variable_t *)malloc( 16 * sizeof( variable_t ) );
if( !p_new->p_vars )
{
- free( p_new );
+ if( i_type != VLC_OBJECT_ROOT )
+ free( p_new );
return NULL;
}
if( i_type == VLC_OBJECT_ROOT )
{
- /* If i_type is root, then p_new is actually p_libvlc */
- p_new->p_libvlc = (libvlc_t*)p_new;
- p_new->p_vlc = NULL;
+ /* If i_type is root, then p_new is actually p_libvlc_global */
+ p_new->p_libvlc_global = (libvlc_global_data_t*)p_new;
+ p_new->p_libvlc = NULL;
- p_new->p_libvlc->i_counter = 0;
+ p_new->p_libvlc_global->i_counter = 0;
p_new->i_object_id = 0;
- p_new->p_libvlc->i_objects = 1;
- p_new->p_libvlc->pp_objects = malloc( sizeof(vlc_object_t *) );
- p_new->p_libvlc->pp_objects[0] = p_new;
+ p_new->p_libvlc_global->i_objects = 1;
+ p_new->p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) );
+ p_new->p_libvlc_global->pp_objects[0] = p_new;
p_new->b_attached = VLC_TRUE;
}
else
{
- p_new->p_libvlc = p_this->p_libvlc;
- p_new->p_vlc = ( i_type == VLC_OBJECT_VLC ) ? (vlc_t*)p_new
- : p_this->p_vlc;
+ p_new->p_libvlc_global = p_this->p_libvlc_global;
+ p_new->p_libvlc = ( i_type == VLC_OBJECT_LIBVLC ) ? (libvlc_int_t*)p_new
+ : p_this->p_libvlc;
vlc_mutex_lock( &structure_lock );
- p_new->p_libvlc->i_counter++;
- p_new->i_object_id = p_new->p_libvlc->i_counter;
+ p_new->p_libvlc_global->i_counter++;
+ p_new->i_object_id = p_new->p_libvlc_global->i_counter;
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
- INSERT_ELEM( p_new->p_libvlc->pp_objects,
- p_new->p_libvlc->i_objects,
- p_new->p_libvlc->i_objects,
- p_new );
+ TAB_APPEND( p_new->p_libvlc_global->i_objects,
+ p_new->p_libvlc_global->pp_objects,
+ p_new );
vlc_mutex_unlock( &structure_lock );
}
/* 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,
+ "waited too long, cancelling destruction (id=%d,type=%d)",
+ p_this->i_object_id, p_this->i_object_type );
return;
}
free( p_this->p_vars );
vlc_mutex_destroy( &p_this->var_lock );
+ if( p_this->psz_header ) free( p_this->psz_header );
+
if( p_this->i_object_type == VLC_OBJECT_ROOT )
{
/* We are the root object ... no need to lock. */
- free( p_this->p_libvlc->pp_objects );
- p_this->p_libvlc->pp_objects = NULL;
- p_this->p_libvlc->i_objects--;
+ free( p_this->p_libvlc_global->pp_objects );
+ p_this->p_libvlc_global->pp_objects = NULL;
+ p_this->p_libvlc_global->i_objects--;
vlc_mutex_destroy( &structure_lock );
}
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
- i_index = FindIndex( p_this, p_this->p_libvlc->pp_objects,
- p_this->p_libvlc->i_objects );
- REMOVE_ELEM( p_this->p_libvlc->pp_objects,
- p_this->p_libvlc->i_objects, i_index );
+ i_index = FindIndex( p_this, p_this->p_libvlc_global->pp_objects,
+ p_this->p_libvlc_global->i_objects );
+ REMOVE_ELEM( p_this->p_libvlc_global->pp_objects,
+ p_this->p_libvlc_global->i_objects, i_index );
vlc_mutex_unlock( &structure_lock );
}
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
- free( p_this );
+ /* root is not dynamically allocated by vlc_object_create */
+ if( p_this->i_object_type != VLC_OBJECT_ROOT )
+ free( p_this );
}
/**
vlc_mutex_lock( &structure_lock );
- pp_objects = p_this->p_libvlc->pp_objects;
+ pp_objects = p_this->p_libvlc_global->pp_objects;
/* Perform our dichotomy */
- for( i_max = p_this->p_libvlc->i_objects - 1 ; ; )
+ for( i_max = p_this->p_libvlc_global->i_objects - 1 ; ; )
{
i_middle = i_max / 2;
/* Find the root */
while( p_root->p_parent != NULL &&
- p_root != VLC_OBJECT( p_this->p_vlc ) )
+ p_root != VLC_OBJECT( p_this->p_libvlc ) )
{
p_root = p_root->p_parent;
}
p_found = FindObject( p_root, i_type, (i_mode & ~0x000f)|FIND_CHILD );
- if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_vlc ) )
+ if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_libvlc ) )
{
- p_found = FindObject( VLC_OBJECT( p_this->p_vlc ),
+ p_found = FindObject( VLC_OBJECT( p_this->p_libvlc ),
i_type, (i_mode & ~0x000f)|FIND_CHILD );
}
}
switch( i_mode & 0x000f )
{
case FIND_ANYWHERE:
- pp_current = p_this->p_libvlc->pp_objects;
- pp_end = pp_current + p_this->p_libvlc->i_objects;
+ pp_current = p_this->p_libvlc_global->pp_objects;
+ pp_end = pp_current + p_this->p_libvlc_global->i_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
}
p_list = NewList( i_count );
- pp_current = p_this->p_libvlc->pp_objects;
+ pp_current = p_this->p_libvlc_global->pp_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
}
else
{
- p_object = p_this->p_vlc ? VLC_OBJECT(p_this->p_vlc) : p_this;
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
}
vlc_mutex_lock( &structure_lock );
vlc_mutex_lock( &structure_lock );
- pp_current = p_this->p_libvlc->pp_objects;
- pp_end = pp_current + p_this->p_libvlc->i_objects;
+ pp_current = p_this->p_libvlc_global->pp_objects;
+ pp_end = pp_current + p_this->p_libvlc_global->i_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
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 )
{
projects / vlc / blobdiff