Changeset 65892ac8249cd60f0f2ae25e138a76c76436e9e3

Timestamp:

06/04/08 20:14:30 (3 months ago)

Author:

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

git-committer:

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

git-parent:

[bed1fe1b898a0721a58461fe7c97f0eb376ac1d2]

git-author:

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

Message:

Handle sout-keep from the playlist engine

Files:

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

src/libvlc.h

@@ -238 +238 @@
-    vlc_object_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

@@ -465 +465 @@
-{
-    input_item_t *p_input = p_item->p_input;
+    sout_instance_t **pp_sout = &libvlc_priv(p_playlist->p_libvlc)->p_sout;
-    int i_activity = var_GetInteger( p_playlist, "activity" ) ;
-
@@ -476 +477 @@
-    var_SetInteger( p_playlist, "activity", i_activity +
-                    DEFAULT_INPUT_ACTIVITY );
-
+
+
+
-
-    char *psz_uri = input_item_GetURI( p_item->p_input );

src/playlist/engine.c

@@ -27 +27 @@
-#endif
-
+#include <assert.h>
-#include <vlc_common.h>
-#include <vlc_vout.h>
@@ -264 +265 @@
-            int i_activity;
-            input_thread_t *p_input;
+            sout_instance_t **pp_sout =
+                &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+
-            PL_DEBUG( "dead input" );
-
-            p_input = p_playlist->p_input;
-            p_playlist->p_input = NULL;
+            assert( *pp_sout == NULL );
+            if( var_CreateGetBool( p_input, "sout-keep" ) )
+                *pp_sout = input_DetachSout( p_input );
-
-            /* Release the playlist lock, because we may get stuck
@@ -405 +412 @@
-            PL_UNLOCK;
-
+            /* sout-keep: no need to anything here.
+             * The last input will destroy its sout, if any, by itself */
+
-            /* Destroy input */
-            vlc_object_release( p_input );
@@ -430 +440 @@
-
-#ifdef ENABLE_SOUT
-
-
-
-
-
-
-
-
+
+
+
+
-#endif
-