Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / stream_out / description.c

diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index 29e33367617b71d70df880cceeede2d18452b924..e1ebd6c1bb7e837d531eed2ae36bdef27b069bff 100644 (file)
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -29,12 +29,14 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_block.h>
 #include <vlc_sout.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
@@ -48,24 +50,20 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("Description stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "description" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Description stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "description" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 struct sout_stream_sys_t
 {
-    int            i_id;
-    input_thread_t *p_input;
-
     mtime_t i_stream_start;
 };
 
 struct sout_stream_id_t
 {
-    int i_d_u_m_m_y;
 };
 
 /*****************************************************************************
@@ -81,9 +79,6 @@ static int Open( vlc_object_t *p_this )
     p_stream->pf_send = Send;
     p_sys = p_stream->p_sys = malloc(sizeof(sout_stream_sys_t));
 
-    p_sys->i_id = 0;
-    p_sys->p_input = NULL;
-
     p_sys->i_stream_start = 0;
 
     return VLC_SUCCESS;
@@ -97,10 +92,7 @@ static void Close( vlc_object_t *p_this )
     sout_stream_t *p_stream = (sout_stream_t *)p_this;
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
-    msg_Dbg( p_this, "description: Closing the module" );
-
-    /* It can happen only if buggy */
-    assert( !p_sys->p_input );
+    msg_Dbg( p_this, "Closing" );
 
     free( p_sys );
 }
@@ -111,15 +103,13 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     sout_stream_id_t *id;
     es_format_t *p_fmt_copy;
     input_item_t *p_item;
+    input_thread_t *p_input;
 
-    msg_Dbg( p_stream, "description: Adding a stream" );
-
-    if( !p_sys->p_input )
-        p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
-    if( !p_sys->p_input )
-        return NULL;
+    msg_Dbg( p_stream, "Adding a stream" );
+    p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
+    assert( p_input );
  
-    p_item = input_GetItem(p_sys->p_input);
+    p_item = input_GetItem(p_input);
 
     p_fmt_copy = malloc(sizeof(es_format_t));
     es_format_Copy( p_fmt_copy, p_fmt );
@@ -127,28 +117,18 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     vlc_mutex_lock( &p_item->lock );
     TAB_APPEND( p_item->i_es, p_item->es, p_fmt_copy );
     vlc_mutex_unlock( &p_item->lock );
+    vlc_object_release( p_input );
 
-    p_sys->i_id++;
     if( p_sys->i_stream_start <= 0 )
         p_sys->i_stream_start = mdate();
 
     id = malloc( sizeof( sout_stream_id_t ) );
-    id->i_d_u_m_m_y = 0;
     return id;
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
-    sout_stream_sys_t *p_sys = p_stream->p_sys;
-
-    msg_Dbg( p_stream, "description: Removing a stream (id:%d)", p_sys->i_id );
-
-    p_sys->i_id--;
-    if( p_sys->i_id <= 0 )
-    {
-        vlc_object_release( p_sys->p_input );
-        p_sys->p_input = NULL;
-    }
+    msg_Dbg( p_stream, "Removing a stream" );
 
     free( id );
     return VLC_SUCCESS;
@@ -162,8 +142,17 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 
     block_ChainRelease( p_buffer );
 
-    if( p_sys->p_input && p_sys->i_stream_start + 1500000 < mdate() )
-        p_sys->p_input->b_eof = true;
+    if( p_sys->i_stream_start + 1500000 < mdate() )
+    {
+        input_thread_t *p_input;
+
+        p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_PARENT );
+        if( p_input )
+        {
+            p_input->b_eof = true;
+            vlc_object_release( p_input );
+        }
+    }
 
     return VLC_SUCCESS;
 }