[vlc-commits] intf: change vlc_playlist_t parenting
Thomas Guillem
git at videolan.org
Fri Mar 8 10:10:45 CET 2019
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Mar 8 10:04:28 2019 +0100| [12fa60c726777aa4d05c36c2f5477e5618920a17] | committer: Thomas Guillem
intf: change vlc_playlist_t parenting
Like for the legacy playlist_t, the parent must be the libvlc object.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12fa60c726777aa4d05c36c2f5477e5618920a17
---
src/interface/interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/interface/interface.c b/src/interface/interface.c
index f513f8d2d9..30a10558bf 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -130,16 +130,16 @@ PlaylistConfigureFromVariables(vlc_playlist_t *playlist, vlc_object_t *obj)
vlc_playlist_t *
vlc_intf_GetMainPlaylist(intf_thread_t *intf)
{
- libvlc_priv_t *priv = libvlc_priv(vlc_object_instance(intf));
+ libvlc_int_t *libvlc = vlc_object_instance(intf);
+ libvlc_priv_t *priv = libvlc_priv(libvlc);
vlc_mutex_lock(&lock);
vlc_playlist_t *playlist = priv->main_playlist;
if (priv->main_playlist == NULL)
{
- vlc_object_t *libvlc_obj = VLC_OBJECT(vlc_object_instance(intf));
- playlist = priv->main_playlist = vlc_playlist_New(libvlc_obj);
+ playlist = priv->main_playlist = vlc_playlist_New(VLC_OBJECT(libvlc));
if (playlist)
- PlaylistConfigureFromVariables(playlist, libvlc_obj);
+ PlaylistConfigureFromVariables(playlist, VLC_OBJECT(libvlc));
}
vlc_mutex_unlock(&lock);
More information about the vlc-commits
mailing list