[vlc-commits] cli: remove write-only intf_sys_t.playlist

Rémi Denis-Courmont git at videolan.org
Sun Nov 29 14:55:49 CET 2020


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 28 16:29:30 2020 +0200| [1485f118975d0f156b27b4a04a65b42ee3b1fcbd] | committer: Rémi Denis-Courmont

cli: remove write-only intf_sys_t.playlist

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1485f118975d0f156b27b4a04a65b42ee3b1fcbd
---

 modules/control/cli/cli.c    | 1 -
 modules/control/cli/cli.h    | 4 ----
 modules/control/cli/player.c | 1 +
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/control/cli/cli.c b/modules/control/cli/cli.c
index dfab8127a7..5fc50229e6 100644
--- a/modules/control/cli/cli.c
+++ b/modules/control/cli/cli.c
@@ -772,7 +772,6 @@ static int Activate( vlc_object_t *p_this )
     p_sys->commands = NULL;
     vlc_mutex_init(&p_sys->output_lock);
     p_sys->pi_socket_listen = pi_socket;
-    p_sys->playlist = vlc_intf_GetMainPlaylist(p_intf);;
 
     RegisterHandlers(p_intf, cmds, ARRAY_SIZE(cmds), p_intf);
 
diff --git a/modules/control/cli/cli.h b/modules/control/cli/cli.h
index 394396cc88..326cb74313 100644
--- a/modules/control/cli/cli.h
+++ b/modules/control/cli/cli.h
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <vlc_common.h>
-#include <vlc_playlist.h>
 
 struct intf_sys_t
 {
@@ -31,9 +30,6 @@ struct intf_sys_t
     void *commands;
     void *player_cli;
 
-    /* playlist */
-    vlc_playlist_t              *playlist;
-
     vlc_mutex_t output_lock;
 #ifndef _WIN32
     FILE *stream;
diff --git a/modules/control/cli/player.c b/modules/control/cli/player.c
index e64b505d79..113465fa41 100644
--- a/modules/control/cli/player.c
+++ b/modules/control/cli/player.c
@@ -32,6 +32,7 @@
 #include <vlc_interface.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
+#include <vlc_playlist.h>
 #include <vlc_player.h>
 
 #include "cli.h"



More information about the vlc-commits mailing list