[vlc-devel] commit: Qt4: store input_item_t* in plitem and handle metadata in model ( Ilkka Ollakka )

[Jakob Leben]

On Thu, Aug 13, 2009 at 2:48 PM, git version control <git at videolan.org>wrote:

> diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp
> b/modules/gui/qt4/components/playlist/playlist_item.cpp
> index b0436f0..4b54806 100644
> --- a/modules/gui/qt4/components/playlist/playlist_item.cpp
> +++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
> @@ -48,15 +48,17 @@
>  */
>
>
> -void PLItem::init( int _i_id, int _i_input_id, bool _is_node, PLItem
> *parent, PLModel *m, QSettings *settings )
> +void PLItem::init( playlist_item_t *_playlist_item, PLItem *parent,
> PLModel *m, QSettings *settings )
>  {
>     parentItem = parent;          /* Can be NULL, but only for the rootItem
> */
> -    i_id       = _i_id;           /* Playlist item specific id */
> -    i_input_id = _i_input_id;     /* Identifier of the input */
> +    i_id       = _playlist_item->i_id;           /* Playlist item specific
> id */
> +    i_input_id = _playlist_item->p_input->i_id;     /* Identifier of the
> input */
>     model      = m;               /* PLModel (QAbsmodel) */
>     i_type     = -1;              /* Item type - Avoid segfault */
>     b_current  = false;           /* Is the item the current Item or not */
> -    b_is_node = _is_node;
> *+    b_is_node  = _playlist_item->i_children > 1;*
> +    p_input    = _playlist_item->p_input;
> +    vlc_gc_incref( p_input );
>

Should be:
b_is_node  = _playlist_item->i_children > - 1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20090813/4760f1d1/attachment.html>