Changeset e3f0531d93abd49f902a324241e31200de05b45d

Timestamp:

14/09/08 11:35:42 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1221384942 +0300

git-parent:

[8df80e5ede700e71f673cf052958015b7c851d5c]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1221384942 +0300

Message:

Playlist: put private data after public data

Files:

• include/vlc_playlist.h (modified) (2 diffs)
• src/input/meta.c (modified) (2 diffs)
• src/playlist/control.c (modified) (6 diffs)
• src/playlist/engine.c (modified) (9 diffs)
• src/playlist/playlist_internal.h (modified) (1 diff)
• src/playlist/thread.c (modified) (3 diffs)

include/vlc_playlist.h

@@ -154 +154 @@
-{ PLAYLIST_STOPPED,PLAYLIST_RUNNING,PLAYLIST_PAUSED } playlist_status_t;
-
-typedef struct playlist_private_t playlist_private_t;
-
-/** Structure containing information about the playlist */
-struct playlist_t
@@ -225 +223 @@
-        vlc_mutex_t         lock;     /**< Lock to protect request */
-    } request;
-
-    /* All other data is PRIVATE. You can't access it
-     * outside of src/input */
-    playlist_private_t *p;
-};
-

src/input/meta.c

@@ -100 +100 @@
-    if( psz_artist && psz_album )
-    {
-_playlist->p
+l_priv(p_playlist)
-            if( !strcmp( album.psz_artist, psz_artist ) &&
-                !strcmp( album.psz_album, psz_album ) )
@@ -180 +180 @@
-        a.psz_arturl = input_item_GetArtURL( p_item );
-        a.b_found = (i_ret == VLC_EGENERIC ? false : true );
-_playlist->p
+l_priv(p_playlist)
-    }
-    else

src/playlist/control.c

@@ -190 +190 @@
-                              input_item_t *p_item )
-{
-_playlist->p
+l_priv(p_playlist)
-
-    vlc_gc_incref( p_item );
@@ -207 +207 @@
-                                  playlist_item_t *p_item )
-{
-_playlist->p
+l_priv(p_playlist)
-
-    vlc_object_lock( p_playlist );
@@ -220 +220 @@
-                               input_item_t *p_item )
-{
-
-
-
-
+
+
+
+
+
-        return VLC_EGENERIC;
-    }
-
-    vlc_gc_incref( p_item );
-
-
-
-
-
+
+
+
+
-    return VLC_SUCCESS;
-}
@@ -239 +239 @@
-                                    playlist_item_t *p_item )
-{
-_playlist->p
+l_priv(p_playlist)
-
-    if( p_item->i_children == -1 )
@@ -506 +506 @@
-{
-    input_item_t *p_input = p_item->p_input;
-_playlist->p
+l_priv(p_playlist)
-    int i_activity = var_GetInteger( p_playlist, "activity" ) ;
-
@@ -535 +535 @@
-    free( psz_uri );
-
-_playlist->p
-    p_playlist->p
+l_priv(p_playlist)
+pl_priv(p_playlist)
-    {
-        bool b_has_art;

src/playlist/engine.c

@@ -62 +62 @@
-    static const char playlist_name[] = "playlist";
-    playlist_t *p_playlist;
+    playlist_private_t *p;
-    bool b_save;
-
-    /* Allocate structure */
-_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist
-         
-_playlist
+ = vlc_custom_create( p_parent, sizeof( *p
+
+
-        return NULL;
-
+    assert( offsetof( playlist_private_t, public_data ) == 0 );
+    p_playlist = &p->public_data;
-    TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
-    MALLOC_NULL( p_playlist->p, playlist_private_t );
-    memset( p_playlist->p, 0, sizeof( playlist_private_t ) );
-
-    libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist;
@@ -79 +80 @@
-
-    /* Initialise data structures */
-    p_playlist->p->p_playlist = p_playlist;
-    p_playlist->i_last_playlist_id = 0;
-    p_playlist->p_input = NULL;
@@ -177 +177 @@
-{
-    playlist_t * p_playlist = (playlist_t *)p_this;
-_playlist->p
+l_priv(p_playlist)
-
-    /* Destroy the item preparser */
@@ -194 +194 @@
-
-    /* Destroy the item meta-infos fetcher */
-_playlist->p
-
-_playlist->p
+l_priv(p_playlist)
+
+l_priv(p_playlist)
-    }
-    msg_Dbg( p_this, "Destroyed" );
@@ -380 +380 @@
-            int i_activity;
-            input_thread_t *p_input;
-_playlist->p
+l_priv(p_playlist)
-
-            PL_DEBUG( "dead input" );
@@ -521 +521 @@
-#ifdef ENABLE_SOUT
-    /* close the remaining sout-keep (if there was no input atm) */
-_playlist->p
+l_priv(p_playlist)
-    if (p_sout)
-        sout_DeleteInstance( p_sout );
@@ -531 +531 @@
-    playlist_MLDump( p_playlist );
-
-_playlist->p
-_playlist->p
+l_priv(p_playlist)
+l_priv(p_playlist)
-
-    PL_LOCK;
@@ -570 +570 @@
-{
-    playlist_preparse_t *p_preparse = data;
- 
-_playlist
+&
+ublic_data
-    int i_activity;
-
@@ -616 +616 @@
-            char *psz_arturl = input_item_GetArtURL( p_current );
-            char *psz_name = input_item_GetName( p_current );
-
-
+
+
+
-            {
-                PL_DEBUG("meta ok for %s, need to fetch art", psz_name );
-playlist->p->p_
-playlist->p->p_
+
+
-                {
-
-
-
-
+
+
+
-                }
-                else
-                    vlc_gc_decref( p_current );
-playlist->p->p_
+
-            }
-            else

src/playlist/playlist_internal.h

@@ -59 +59 @@
-} playlist_fetcher_t;
-
-
+typedef 
-{
-*p_playlist; /**< Public data */
+public_data;
-    playlist_preparse_t  preparse; /**< Preparser data */
-    playlist_fetcher_t   *p_fetcher; /**< Meta and art fetcher object */
-    sout_instance_t      *p_sout; /**< Kept sout instance */
-
+
+
+
-
-/*****************************************************************************

src/playlist/thread.c

@@ -58 +58 @@
-
-    // Preparse
-_playlist->p
+l_priv(p_playlist)
-    vlc_mutex_init (&p_preparse->lock);
-    vlc_cond_init (&p_preparse->wait);
@@ -75 +75 @@
-    // Secondary Preparse
-    static const char fname[] = "fetcher";
-
+
+
-        vlc_custom_create( p_playlist, sizeof( playlist_fetcher_t ),
-                           VLC_OBJECT_GENERIC, fname );
-playlist->p->p_
+
-    {
-        msg_Err( p_playlist, "unable to create secondary preparser" );
@@ -84 +85 @@
-        return;
-    }
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
-                           VLC_THREAD_PRIORITY_LOW, false ) )
-    {
-        msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
-playlist->p->p_
+
-        return;
-    }