Missing #include

[vlc] / modules / stream_out / description.c

diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index 3f0e78aca3997a5d1ce339f486bed8404dfa377f..ba44fb01bd22735ed04a41657ca476a2ab1685a9 100644 (file)
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -24,14 +24,19 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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
  *****************************************************************************/
@@ -45,22 +50,21 @@ 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
 {
-    input_thread_t *p_input;
+    sout_description_data_t *data;
     mtime_t i_stream_start;
 };
 
 struct sout_stream_id_t
 {
-    int i_d_u_m_m_y;
 };
 
 /*****************************************************************************
@@ -76,9 +80,14 @@ 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->p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
-    if( !p_sys->p_input ) return VLC_EGENERIC;
-
+    p_sys->data = var_InheritAddress(p_stream, "sout-description-data");
+    if (p_sys->data == NULL)
+    {
+        msg_Err(p_stream, "Missing data: the description stream output is "
+                "not meant to be used without special setup from the core");
+        free(p_sys);
+        return VLC_EGENERIC;
+    }
     p_sys->i_stream_start = 0;
 
     return VLC_SUCCESS;
@@ -90,33 +99,37 @@ static int Open( vlc_object_t *p_this )
 static void Close( vlc_object_t *p_this )
 {
     sout_stream_t *p_stream = (sout_stream_t *)p_this;
-    vlc_object_release( p_stream->p_sys->p_input );
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+
+    msg_Dbg( p_this, "Closing" );
+
+    free( p_sys );
 }
 
 static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     sout_stream_id_t *id;
-    es_format_t *p_fmt_copy = malloc(sizeof(es_format_t));
-    input_item_t *p_item = input_GetItem(p_sys->p_input);
-
-    id = malloc( sizeof( sout_stream_id_t ) );
-    id->i_d_u_m_m_y = 0;
+    es_format_t *p_fmt_copy;
 
+    msg_Dbg( p_stream, "Adding a stream" );
+ 
+    p_fmt_copy = malloc(sizeof(es_format_t));
     es_format_Copy( p_fmt_copy, 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 );
+    TAB_APPEND( p_sys->data->i_es, p_sys->data->es, p_fmt_copy );
 
-    if( p_sys->i_stream_start <= 0 ) p_sys->i_stream_start = mdate();
+    if( p_sys->i_stream_start <= 0 )
+        p_sys->i_stream_start = mdate();
 
+    id = malloc( sizeof( sout_stream_id_t ) );
     return id;
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
+    msg_Dbg( p_stream, "Removing a stream" );
+
     free( id );
     return VLC_SUCCESS;
 }
@@ -124,14 +137,13 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
                  block_t *p_buffer )
 {
+    VLC_UNUSED(id);
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
     block_ChainRelease( p_buffer );
 
     if( p_sys->i_stream_start + 1500000 < mdate() )
-    {
-        p_sys->p_input->b_eof = VLC_TRUE;
-    }
+        vlc_sem_post(p_sys->data->sem);
 
     return VLC_SUCCESS;
 }