Changeset 138c463bc99d8a6b43aefdf7efb2d487c22b0987

Timestamp:

31/08/08 11:21:18 (3 months ago)

Author:

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

git-committer:

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

git-parent:

[2734c1b4d4f9ddbeff77ad5929c60d486a3151bf]

git-author:

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

Message:

Move kept sout instance to playlist private data

Files:

• src/libvlc.h (modified) (1 diff)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (2 diffs)
• src/playlist/playlist_internal.h (modified) (1 diff)

src/libvlc.h

@@ -226 +226 @@
-    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;
-

src/playlist/control.c

@@ -512 +512 @@
-{
-    input_item_t *p_input = p_item->p_input;
-libvlc_priv(p_playlist->p_libvlc)
+p_playlist->p
-    int i_activity = var_GetInteger( p_playlist, "activity" ) ;
-

src/playlist/engine.c

@@ -366 +366 @@
-            int i_activity;
-            input_thread_t *p_input;
-
-
+
-
-            PL_DEBUG( "dead input" );
@@ -508 +507 @@
-#ifdef ENABLE_SOUT
-    /* close the remaining sout-keep (if there was no input atm) */
-libvlc_priv (p_playlist->p_libvlc)
+p_playlist->p
-    if (p_sout)
-        sout_DeleteInstance( p_sout );

src/playlist/playlist_internal.h

@@ -42 +42 @@
-    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 */
-};
-