Move kept sout instance to playlist private data

diff --git a/src/libvlc.h b/src/libvlc.h
index fe2d940c484db7f0ec9464e659bc2f0e113dc4c1..b188090e98fd853ff8452f5c96b104c1c33783a6 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -225,9 +225,6 @@ typedef struct libvlc_priv_t
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
     interaction_t     *p_interaction;    ///< interface interaction object
     httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)
-
-    /* Private playlist data (FIXME - playlist_t is too public...) */
-    sout_instance_t   *p_sout; ///< kept sout instance (for playlist)
 } libvlc_priv_t;
 
 static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)

diff --git a/src/playlist/control.c b/src/playlist/control.c
index d2dff95bd7dca165cb733defe808d5a72a85b0d2..c4fc878e952182cf570c4bd4f1d5a874a9d77c60 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -511,7 +511,7 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist )
 int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
 {
     input_item_t *p_input = p_item->p_input;
-    sout_instance_t **pp_sout = &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+    sout_instance_t **pp_sout = &p_playlist->p->p_sout;
     int i_activity = var_GetInteger( p_playlist, "activity" ) ;
 
     msg_Dbg( p_playlist, "creating new input thread" );

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 85d06b657705b22df18c50bb86305b09878caed3..d0d4c33effbc15fce858ce33fcd4fe4cc55c821d 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -365,8 +365,7 @@ check_input:
         {
             int i_activity;
             input_thread_t *p_input;
-            sout_instance_t **pp_sout =
-                &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+            sout_instance_t **pp_sout = &p_playlist->p->p_sout;
 
             PL_DEBUG( "dead input" );
 
@@ -507,7 +506,7 @@ void playlist_LastLoop( playlist_t *p_playlist )
 
 #ifdef ENABLE_SOUT
     /* close the remaining sout-keep (if there was no input atm) */
-    sout_instance_t *p_sout = libvlc_priv (p_playlist->p_libvlc)->p_sout;
+    sout_instance_t *p_sout = p_playlist->p->p_sout;
     if (p_sout)
         sout_DeleteInstance( p_sout );
 #endif

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index 07294b3ad2516d47c4a892b218007f510cf8cdb0..cdc4f3cc1073b5cce86dcad3ae2724bc9a9d3347 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -41,6 +41,7 @@ struct playlist_private_t
 {
     playlist_preparse_t  *p_preparse; /**< Preparser object */
     playlist_fetcher_t   *p_fetcher; /**< Meta and art fetcher object */
+    sout_instance_t      *p_sout; /**< Kept sout instance */
 };
 
 struct playlist_preparse_t