Changeset 82921f3c8dae23178b64089b22502bb8f528e7e6

Timestamp:

05/07/08 21:26:56 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210188416 +0300

git-parent:

[3c74d129dd3d8a4bd11a4696f13af83103fe20fb]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210188416 +0300

Message:

Remove p_playlist from p_libvlc

Plugins are already using pl_Yield to get the playlist, as they should.

Files:

• include/vlc_main.h (modified) (2 diffs)
• include/vlc_playlist.h (modified) (1 diff)
• modules/gui/pda/pda_callbacks.c (modified) (4 diffs)
• src/control/media.c (modified) (3 diffs)
• src/control/playlist.c (modified) (1 diff)
• src/input/input.c (modified) (3 diffs)
• src/libvlc-common.c (modified) (5 diffs)
• src/libvlc.c (modified) (10 diffs)
• src/libvlc.h (modified) (1 diff)
• src/misc/win32_specific.c (modified) (1 diff)
• src/playlist/control.c (modified) (2 diffs)
• src/playlist/engine.c (modified) (1 diff)

include/vlc_main.h

@@ -1 +1 @@
-/*****************************************************************************
- * main.h: access to all program variables
-global program
+LibVLC instance
- *****************************************************************************
-
-
+
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -41 +40 @@
-    char *                 psz_homedir;      ///< user's home directory
-
-    playlist_t            *p_playlist;       ///< playlist object
-
-    global_stats_t       *p_stats;           ///< Global statistics
-

include/vlc_playlist.h

@@ -413 +413 @@
-
-/** Tell the number of items in the current playing context */
-obj ) obj->p_libvlc->p_playlist
+pl ) pl
-
-/** Ask the playlist to do some work */

modules/gui/pda/pda_callbacks.c

@@ -121 +121 @@
-                                    0, name,   /* Add path to it !!! */
-                                    1, "no info",
-intf
+playlist
-                                    -1 );
-
@@ -164 +164 @@
-#endif
-    vlc_mutex_lock( &p_playlist->object_lock );
-intf
+playlist
-    {
-        playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy, true );
@@ -385 +385 @@
-    {
-        vlc_mutex_lock( &p_playlist->object_lock );
-intf
+playlist
-        {
-            vlc_mutex_unlock( &p_playlist->object_lock );
@@ -930 +930 @@
-    }
-
-intf
+playlist
-    {
-        msg_Err( p_playlist, "fix pda delete" );

src/control/media.c

@@ -23 +23 @@
-
-#include "libvlc_internal.h"
-
+
-#include <vlc/libvlc.h>
-#include <vlc_input.h>
@@ -216 +216 @@
-    {
-        playlist_PreparseEnqueue(
-p_md->p_libvlc_instance->p_libvlc_int
+libvlc_priv (p_md->p_libvlc_instance->p_libvlc_int)
-                p_md->p_input_item );
-        p_md->b_preparsed = true;
@@ -431 +431 @@
-    {
-        playlist_AskForArtEnqueue(
-p_md->p_libvlc_instance->p_libvlc_int
+libvlc_priv(p_md->p_libvlc_instance->p_libvlc_int)
-                p_md->p_input_item );
-    }

src/control/playlist.c

@@ -31 +31 @@
-#include "../playlist/playlist_internal.h"
-
-p_instance->p_libvlc_int->p_playlist
+(libvlc_priv (p_instance->p_libvlc_int)->p_playlist)
-
-static inline int playlist_was_locked( libvlc_instance_t *p_instance )

src/input/input.c

@@ -554 +554 @@
-        /* We have finished */
-        p_input->b_eof = true;
-p_input->p_libvlc
+libvlc_priv (p_input->p_libvlc)
-    }
-
@@ -2111 +2111 @@
-        access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
-        InputUpdateMeta( p_input, p_meta );
-
+
+
-        p_access->info.i_update &= ~INPUT_UPDATE_META;
-    }
@@ -2154 +2155 @@
-    {
-        pl_Yield( p_input );
-p_input->p_libvlc->p_playlist, "item-change"
-
+libvlc_priv (p_input->p_libvlc)->p_playlist
+"item-change", 
-        pl_Release( p_input );
-    }

src/libvlc-common.c

@@ -180 +180 @@
-
-    priv = libvlc_priv (p_libvlc);
-_libvlc
+riv
-    priv->p_interaction = NULL;
-    priv->p_vlm = NULL;
@@ -737 +737 @@
-    /* Initialize playlist and get commandline files */
-    playlist_ThreadCreate( p_libvlc );
-_libvlc
+riv
-    {
-        msg_Err( p_libvlc, "playlist initialization failed" );
@@ -747 +747 @@
-        return VLC_EGENERIC;
-    }
-_libvlc
+riv
-
-    psz_modules = config_GetPsz( p_playlist, "services-discovery" );
@@ -940 +940 @@
-    /* Free playlist */
-    msg_Dbg( p_libvlc, "removing playlist" );
-_libvlc
+riv
-
-    /* Free video outputs */
@@ -1139 +1139 @@
-    /* Interface doesn't handle play on start so do it ourselves */
-    if( !p_intf->b_play && b_play )
-p_libvlc
+libvlc_priv(p_libvlc)
-
-    /* Try to run the interface */

src/libvlc.c

@@ -297 +297 @@
-#define LIBVLC_PLAYLIST_FUNC \
-    libvlc_int_t *p_libvlc = vlc_current_object( i_object );\
-
-
+
+
+
-
-#define LIBVLC_PLAYLIST_FUNC_END \
-vlc_object_release( p_libvlc->p_playlist
+pl_Release( p_libvlc
-    if( i_object ) vlc_object_release( p_libvlc );
-
@@ -316 +317 @@
-    int i_err;
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-                             NULL,  i_mode, i_pos, -1,
-                             ppsz_options, i_options, true, false );
@@ -329 +330 @@
-{
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return VLC_SUCCESS;
@@ -340 +341 @@
-{
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return VLC_SUCCESS;
@@ -351 +352 @@
-{
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return VLC_SUCCESS;
@@ -364 +365 @@
-
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    {
-        vlc_value_t  val;
-libvlc->p_
+
-        b_playing = ( val.i_int == PLAYING_S );
-    }
-    else
-    {
-libvlc->p_
+
-    }
-    LIBVLC_PLAYLIST_FUNC_END;
@@ -673 +674 @@
-    int i_size;
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return i_size;
@@ -686 +687 @@
-{
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return VLC_SUCCESS;
@@ -699 +700 @@
-{
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return VLC_SUCCESS;
@@ -710 +711 @@
-{
-    LIBVLC_PLAYLIST_FUNC;
-libvlc->p_
+
-    LIBVLC_PLAYLIST_FUNC_END;
-    return VLC_SUCCESS;

src/libvlc.h

@@ -233 +233 @@
-
-    module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
-
+
+
-    vlc_object_t      *p_interaction;    ///< interface interaction object
-    httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)

src/misc/win32_specific.c

@@ -315 +315 @@
-
-        /* Add files to the playlist */
-
-
-
+
-        if( !p_playlist ) return 0;
-

src/playlist/control.c

@@ -44 +44 @@
-playlist_t *__pl_Yield( vlc_object_t *p_this )
-{
-p_this->p_libvlc
+libvlc_priv (p_this->p_libvlc)
-    assert( pl != NULL );
-    vlc_object_yield( pl );
@@ -52 +52 @@
-void __pl_Release( vlc_object_t *p_this )
-{
-p_this->p_libvlc
+libvlc_priv (p_this->p_libvlc)
-    assert( pl != NULL );
-    vlc_object_release( pl );

src/playlist/engine.c

@@ -75 +75 @@
-    TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
-
-p_parent->p_libvlc
+libvlc_priv(p_parent->p_libvlc)
-
-    VariablesInit( p_playlist );