/*****************************************************************************
* objects.c: vlc_object_t handling
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.33 2002/12/14 19:34:06 gbazin Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
+/**
+ * \file
+ * This file contains the functions to handle the vlc_object_t type
+ */
+
+
/*****************************************************************************
* 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 "video.h"
+#include "vlc_video.h"
#include "video_output.h"
#include "audio_output.h"
#include "stream_output.h"
#include "vlc_playlist.h"
-#include "interface.h"
+#include "vlc_interface.h"
+#include "vlc_codec.h"
+
+#include "vlc_opengl.h"
+#include "vlc_httpd.h"
+#include "vlc_vlm.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int FindIndex ( vlc_object_t *, vlc_object_t **, int );
static void SetAttachment ( vlc_object_t *, vlc_bool_t );
-static vlc_list_t NewList ( int );
+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 int CountChildren ( vlc_object_t *, int );
* i_type is not a known value such as VLC_OBJECT_ROOT, VLC_OBJECT_VOUT and
* so on, vlc_object_create will use its value for the object size.
*****************************************************************************/
+
+/**
+ * Initialize a vlc object
+ *
+ * This function allocates memory for a vlc object and initializes it. If
+ * i_type is not a known value such as VLC_OBJECT_ROOT, VLC_OBJECT_VOUT and
+ * so on, vlc_object_create will use its value for the object size.
+ */
void * __vlc_object_create( vlc_object_t *p_this, int i_type )
{
vlc_object_t * p_new;
i_size = sizeof(intf_thread_t);
psz_type = "interface";
break;
+ case VLC_OBJECT_DIALOGS:
+ i_size = sizeof(intf_thread_t);
+ psz_type = "dialogs provider";
+ break;
case VLC_OBJECT_PLAYLIST:
i_size = sizeof(playlist_t);
psz_type = "playlist";
i_size = sizeof(input_thread_t);
psz_type = "input";
break;
+ case VLC_OBJECT_DEMUX:
+ 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";
+ break;
case VLC_OBJECT_DECODER:
- i_size = sizeof(decoder_fifo_t);
+ i_size = sizeof(decoder_t);
psz_type = "decoder";
break;
+ case VLC_OBJECT_PACKETIZER:
+ i_size = sizeof(decoder_t);
+ psz_type = "packetizer";
+ break;
+ case VLC_OBJECT_ENCODER:
+ i_size = sizeof(encoder_t);
+ psz_type = "encoder";
+ break;
case VLC_OBJECT_VOUT:
i_size = sizeof(vout_thread_t);
psz_type = "video output";
i_size = sizeof(sout_instance_t);
psz_type = "stream output";
break;
+ case VLC_OBJECT_HTTPD:
+ i_size = sizeof( httpd_t );
+ psz_type = "http daemon";
+ break;
+ case VLC_OBJECT_VLM:
+ i_size = sizeof( vlm_t );
+ psz_type = "vlm dameon";
+ break;
+ case VLC_OBJECT_OPENGL:
+ i_size = sizeof( opengl_t );
+ psz_type = "opengl provider";
+ break;
+ case VLC_OBJECT_ANNOUNCE:
+ i_size = sizeof( announce_handler_t );
+ psz_type = "announce handler";
+ break;
default:
i_size = i_type > 0
? i_type > (int)sizeof(vlc_object_t)
return p_new;
}
-/*****************************************************************************
- * vlc_object_destroy: destroy a vlc object
- *****************************************************************************
+/**
+ ****************************************************************************
+ * Destroy a vlc object
+ *
* This function destroys an object that has been previously allocated with
* vlc_object_create. The object's refcount must be zero and it must not be
* attached to other objects in any way.
if( p_this->i_children )
{
- msg_Err( p_this, "cannot delete object with children" );
+ msg_Err( p_this, "cannot delete object (%i, %s) with children" ,
+ p_this->i_object_id, p_this->psz_object_name );
return;
}
if( p_this->p_parent )
{
- msg_Err( p_this, "cannot delete object with a parent" );
+ msg_Err( p_this, "cannot delete object (%i, %s) with a parent",
+ p_this->i_object_id, p_this->psz_object_name );
return;
}
free( p_this );
}
-/*****************************************************************************
- * vlc_object_get: find an object given its ID
- *****************************************************************************
+/**
+ * find an object given its ID
+ *
* This function looks for the object whose i_object_id field is i_id. We
* use a dichotomy so that lookups are in log2(n).
*****************************************************************************/
return NULL;
}
-/*****************************************************************************
- * vlc_object_find: find a typed object and increment its refcount
+/**
+ ****************************************************************************
+ * find a typed object and increment its refcount
*****************************************************************************
* This function recursively looks for a given object type. i_mode can be one
* of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
/* Otherwise, recursively look for the object */
if( (i_mode & 0x000f) == FIND_ANYWHERE )
{
- p_found = FindObject( VLC_OBJECT(p_this->p_vlc), i_type,
- (i_mode & ~0x000f) | FIND_CHILD );
+ vlc_object_t *p_root = p_this;
+
+ /* Find the root */
+ while( p_root->p_parent != NULL &&
+ p_root != VLC_OBJECT( p_this->p_vlc ) )
+ {
+ 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 ) )
+ {
+ p_found = FindObject( VLC_OBJECT( p_this->p_vlc ),
+ i_type, (i_mode & ~0x000f)|FIND_CHILD );
+ }
}
else
{
return p_found;
}
-/*****************************************************************************
- * vlc_object_yield: increment an object refcount
+/**
+ ****************************************************************************
+ * increment an object refcount
*****************************************************************************/
void __vlc_object_yield( vlc_object_t *p_this )
{
vlc_mutex_unlock( &structure_lock );
}
-/*****************************************************************************
- * vlc_object_release: decrement an object refcount
+/**
+ ****************************************************************************
+ * decrement an object refcount
*****************************************************************************/
void __vlc_object_release( vlc_object_t *p_this )
{
vlc_mutex_unlock( &structure_lock );
}
-/*****************************************************************************
- * vlc_object_attach: attach object to a parent object
+/**
+ ****************************************************************************
+ * attach object to a parent object
*****************************************************************************
* This function sets p_this as a child of p_parent, and p_parent as a parent
* of p_this. This link can be undone using vlc_object_detach.
vlc_mutex_unlock( &structure_lock );
}
-/*****************************************************************************
- * vlc_object_detach: detach object from its parent
+/**
+ ****************************************************************************
+ * detach object from its parent
*****************************************************************************
* This function removes all links between an object and its parent.
*****************************************************************************/
vlc_mutex_unlock( &structure_lock );
}
-/*****************************************************************************
- * vlc_list_find: find a list typed objects and increment their refcount
+/**
+ ****************************************************************************
+ * find a list typed objects and increment their refcount
*****************************************************************************
* This function recursively looks for a given object type. i_mode can be one
* of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
*****************************************************************************/
-vlc_list_t __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
+vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
{
- vlc_list_t list;
+ vlc_list_t *p_list;
vlc_object_t **pp_current, **pp_end;
int i_count = 0, i_index = 0;
}
}
- list = NewList( i_count );
+ p_list = NewList( i_count );
pp_current = p_this->p_libvlc->pp_objects;
for( ; pp_current < pp_end ; pp_current++ )
if( (*pp_current)->b_attached
&& (*pp_current)->i_object_type == i_type )
{
- ListReplace( &list, *pp_current, i_index );
+ ListReplace( p_list, *pp_current, i_index );
if( i_index < i_count ) i_index++;
}
}
case FIND_CHILD:
i_count = CountChildren( p_this, i_type );
- list = NewList( i_count );
+ p_list = NewList( i_count );
/* Check allocation was successful */
- if( list.i_count != i_count )
+ if( p_list->i_count != i_count )
{
msg_Err( p_this, "list allocation failed!" );
- list.i_count = 0;
+ p_list->i_count = 0;
break;
}
- list.i_count = 0;
- ListChildren( &list, p_this, i_type );
+ p_list->i_count = 0;
+ ListChildren( p_list, p_this, i_type );
break;
default:
msg_Err( p_this, "unimplemented!" );
- list = NewList( 0 );
+ p_list = NewList( 0 );
break;
}
vlc_mutex_unlock( &structure_lock );
- return list;
+ return p_list;
}
/*****************************************************************************
if( *newval.psz_string )
{
vlc_object_release( p_this );
- }
+ }
}
else if( *psz_cmd == 'l' )
{
}
free( p_list->p_values );
+ free( p_list );
}
/* Following functions are local */
}
}
-static vlc_list_t NewList( int i_count )
+static vlc_list_t * NewList( int i_count )
{
- vlc_list_t list;
+ vlc_list_t * p_list = (vlc_list_t *)malloc( sizeof( vlc_list_t ) );
+ if( p_list == NULL )
+ {
+ return NULL;
+ }
- list.i_count = i_count;
+ p_list->i_count = i_count;
if( i_count == 0 )
{
- list.p_values = NULL;
- return list;
+ p_list->p_values = NULL;
+ return p_list;
}
- list.p_values = malloc( i_count * sizeof( vlc_value_t ) );
- if( list.p_values == NULL )
+ p_list->p_values = malloc( i_count * sizeof( vlc_value_t ) );
+ if( p_list->p_values == NULL )
{
- list.i_count = 0;
- return list;
+ p_list->i_count = 0;
+ return p_list;
}
- return list;
+ return p_list;
}
static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object,
projects / vlc / blobdiff