/*****************************************************************************
* item.c: input_item management
*****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2004 VLC authors and VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <assert.h>
+#include <time.h>
#include <vlc_common.h>
#include <vlc_url.h>
-#include "vlc_playlist.h"
-#include "vlc_interface.h"
+#include <vlc_interface.h>
#include <vlc_charset.h>
-#include <vlc_atomic.h>
#include "item.h"
#include "info.h"
static int GuessType( const input_item_t *p_item );
-static inline void input_item_Clean( input_item_t *p_i )
-{
- int i;
-
- vlc_event_manager_fini( &p_i->event_manager );
-
- free( p_i->psz_name );
- free( p_i->psz_uri );
- if( p_i->p_stats )
- {
- vlc_mutex_destroy( &p_i->p_stats->lock );
- free( p_i->p_stats );
- }
-
- if( p_i->p_meta )
- vlc_meta_Delete( p_i->p_meta );
-
- for( i = 0; i < p_i->i_options; i++ )
- free( p_i->ppsz_options[i] );
- TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
- free( p_i->optflagv);
-
- for( i = 0; i < p_i->i_es; i++ )
- {
- es_format_Clean( p_i->es[i] );
- free( p_i->es[i] );
- }
- TAB_CLEAN( p_i->i_es, p_i->es );
-
- for( i = 0; i < p_i->i_epg; i++ )
- vlc_epg_Delete( p_i->pp_epg[i] );
- TAB_CLEAN( p_i->i_epg, p_i->pp_epg );
-
- for( i = 0; i < p_i->i_categories; i++ )
- info_category_Delete( p_i->pp_categories[i] );
- TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
-
- vlc_mutex_destroy( &p_i->lock );
-}
void input_item_SetErrorWhenReading( input_item_t *p_i, bool b_error )
{
bool b_changed;
return b_fetched;
}
-static void input_item_Destroy ( gc_object_t *p_gc )
+input_item_t *input_item_Hold( input_item_t *p_item )
{
- input_item_t *p_item = vlc_priv( p_gc, input_item_t );
+ input_item_owner_t *owner = item_owner(p_item);
- input_item_Clean( p_item );
- free( p_item );
+ atomic_fetch_add( &owner->refs, 1 );
+ return p_item;
+}
+
+void input_item_Release( input_item_t *p_item )
+{
+ input_item_owner_t *owner = item_owner(p_item);
+
+ if( atomic_fetch_sub(&owner->refs, 1) != 1 )
+ return;
+
+ vlc_event_manager_fini( &p_item->event_manager );
+
+ free( p_item->psz_name );
+ free( p_item->psz_uri );
+ if( p_item->p_stats != NULL )
+ {
+ vlc_mutex_destroy( &p_item->p_stats->lock );
+ free( p_item->p_stats );
+ }
+
+ if( p_item->p_meta != NULL )
+ vlc_meta_Delete( p_item->p_meta );
+
+ for( int i = 0; i < p_item->i_options; i++ )
+ free( p_item->ppsz_options[i] );
+ TAB_CLEAN( p_item->i_options, p_item->ppsz_options );
+ free( p_item->optflagv );
+
+ for( int i = 0; i < p_item->i_es; i++ )
+ {
+ es_format_Clean( p_item->es[i] );
+ free( p_item->es[i] );
+ }
+ TAB_CLEAN( p_item->i_es, p_item->es );
+
+ for( int i = 0; i < p_item->i_epg; i++ )
+ vlc_epg_Delete( p_item->pp_epg[i] );
+ TAB_CLEAN( p_item->i_epg, p_item->pp_epg );
+
+ for( int i = 0; i < p_item->i_categories; i++ )
+ info_category_Delete( p_item->pp_categories[i] );
+ TAB_CLEAN( p_item->i_categories, p_item->pp_categories );
+
+ vlc_mutex_destroy( &p_item->lock );
+ free( owner );
}
int input_item_AddOption( input_item_t *p_input, const char *psz_option,
#ifdef EPG_DEBUG
vlc_mutex_lock( &p_item->lock );
const int i_epg_info = p_item->i_epg;
- char *ppsz_epg_info[i_epg_info];
- for( int i = 0; i < p_item->i_epg; i++ )
+ if( i_epg_info > 0 )
{
- const vlc_epg_t *p_epg = p_item->pp_epg[i];
- if( asprintf( &ppsz_epg_info[i], "EPG %s", p_epg->psz_name ? p_epg->psz_name : "unknown" ) < 0 )
- ppsz_epg_info[i] = NULL;
- }
- vlc_mutex_unlock( &p_item->lock );
+ char *ppsz_epg_info[i_epg_info];
+ for( int i = 0; i < p_item->i_epg; i++ )
+ {
+ const vlc_epg_t *p_epg = p_item->pp_epg[i];
+ if( asprintf( &ppsz_epg_info[i], "EPG %s", p_epg->psz_name ? p_epg->psz_name : "unknown" ) < 0 )
+ ppsz_epg_info[i] = NULL;
+ }
+ vlc_mutex_unlock( &p_item->lock );
- for( int i = 0; i < i_epg_info; i++ )
- {
- if( !ppsz_epg_info[i] )
- continue;
- input_item_DelInfo( p_item, ppsz_epg_info[i], NULL );
- free( ppsz_epg_info[i] );
+ for( int i = 0; i < i_epg_info; i++ )
+ {
+ if( !ppsz_epg_info[i] )
+ continue;
+ input_item_DelInfo( p_item, ppsz_epg_info[i], NULL );
+ free( ppsz_epg_info[i] );
+ }
}
+ else
+ vlc_mutex_unlock( &p_item->lock );
#endif
vlc_event_t event = { .type = vlc_InputItemInfoChanged, };
int i_options, const char *const *ppsz_options,
unsigned flags, mtime_t duration, int type )
{
- static vlc_atomic_t last_input_id = VLC_ATOMIC_INIT(0);
+ static atomic_uint last_input_id = ATOMIC_VAR_INIT(0);
- input_item_t* p_input = calloc( sizeof( *p_input ), 1 );
- if( !p_input )
+ input_item_owner_t *owner = calloc( 1, sizeof( *owner ) );
+ if( unlikely(owner == NULL) )
return NULL;
+
+ atomic_init( &owner->refs, 1 );
+
+ input_item_t *p_input = &owner->item;
vlc_event_manager_t * p_em = &p_input->event_manager;
- p_input->i_id = vlc_atomic_inc(&last_input_id);
- vlc_gc_init( p_input, input_item_Destroy );
+ p_input->i_id = atomic_fetch_add(&last_input_id, 1);
vlc_mutex_init( &p_input->lock );
p_input->psz_name = NULL;
TAB_INIT( p_input->i_categories, p_input->pp_categories );
TAB_INIT( p_input->i_es, p_input->es );
p_input->p_stats = NULL;
- p_input->i_nb_played = 0;
p_input->p_meta = NULL;
TAB_INIT( p_input->i_epg, p_input->pp_epg );
if( type != ITEM_TYPE_UNKNOWN )
p_input->i_type = type;
- p_input->b_fixed_name = false;
p_input->b_error_when_reading = false;
return p_input;
}
{ "ofdm", ITEM_TYPE_CARD },
{ "oss", ITEM_TYPE_CARD },
{ "pnm", ITEM_TYPE_NET },
- { "pvr", ITEM_TYPE_CARD },
{ "qam", ITEM_TYPE_CARD },
{ "qpsk", ITEM_TYPE_CARD },
{ "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */
static void RecursiveNodeDelete( input_item_node_t *p_node )
{
- for( int i = 0; i < p_node->i_children; i++ )
- RecursiveNodeDelete( p_node->pp_children[i] );
+ for( int i = 0; i < p_node->i_children; i++ )
+ RecursiveNodeDelete( p_node->pp_children[i] );
- vlc_gc_decref( p_node->p_item );
- free( p_node->pp_children );
- free( p_node );
+ vlc_gc_decref( p_node->p_item );
+ free( p_node->pp_children );
+ free( p_node );
}
void input_item_node_Delete( input_item_node_t *p_node )
{
- if( p_node->p_parent )
- {
- for( int i = 0; i < p_node->p_parent->i_children; i++ )
- if( p_node->p_parent->pp_children[i] == p_node )
- {
- REMOVE_ELEM( p_node->p_parent->pp_children,
- p_node->p_parent->i_children,
- i );
- break;
- }
- }
-
- RecursiveNodeDelete( p_node );
+ if( p_node->p_parent )
+ for( int i = 0; i < p_node->p_parent->i_children; i++ )
+ if( p_node->p_parent->pp_children[i] == p_node )
+ {
+ REMOVE_ELEM( p_node->p_parent->pp_children,
+ p_node->p_parent->i_children,
+ i );
+ break;
+ }
+
+ RecursiveNodeDelete( p_node );
}
input_item_node_t *input_item_node_AppendItem( input_item_node_t *p_node, input_item_t *p_item )
void input_item_node_PostAndDelete( input_item_node_t *p_root )
{
- post_subitems( p_root );
+ post_subitems( p_root );
- vlc_event_t event;
- event.type = vlc_InputItemSubItemTreeAdded;
- event.u.input_item_subitem_tree_added.p_root = p_root;
- vlc_event_send( &p_root->p_item->event_manager, &event );
+ vlc_event_t event;
+ event.type = vlc_InputItemSubItemTreeAdded;
+ event.u.input_item_subitem_tree_added.p_root = p_root;
+ vlc_event_send( &p_root->p_item->event_manager, &event );
- input_item_node_Delete( p_root );
+ input_item_node_Delete( p_root );
}
/* Called by es_out when a new Elementary Stream is added or updated. */
projects / vlc / blobdiff