Another bunch of useless test.

[vlc] / modules / stream_out / bridge.c

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 92156f2c7e21f59d39afec73d19b08c2cf99b8c8..618ab28dd864c446f7319cefb039b03d24610da6 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -24,11 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -81,7 +84,6 @@ vlc_module_begin();
                  ID_OFFSET_LONGTEXT, VLC_FALSE );
     set_callbacks( OpenIn, CloseIn );
 
-    var_Create( p_module->p_libvlc_global, "bridge-lock", VLC_VAR_MUTEX );
 vlc_module_end();
 
 
@@ -126,11 +128,10 @@ typedef struct bridge_t
 #define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
 static bridge_t *__GetBridge( vlc_object_t *p_object )
 {
-    libvlc_global_data_t *p_libvlc_global = p_object->p_libvlc_global;
     bridge_t *p_bridge;
     vlc_value_t val;
 
-    if( var_Get( p_libvlc_global, "bridge-struct", &val ) != VLC_SUCCESS )
+    if( var_Get( p_object->p_libvlc, "bridge-struct", &val ) )
     {
         p_bridge = NULL;
     }
@@ -170,7 +171,8 @@ static int OpenOut( vlc_object_t *p_this )
     p_sys          = malloc( sizeof( out_sout_stream_sys_t ) );
     p_sys->b_inited = VLC_FALSE;
 
-    var_Get( p_this->p_libvlc_global, "bridge-lock", &val );
+    var_Create( p_this->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
+    var_Get( p_this->p_libvlc, "bridge-lock", &val );
     p_sys->p_lock = val.p_address;
 
     var_Get( p_stream, SOUT_CFG_PREFIX_OUT "id", &val );
@@ -218,14 +220,14 @@ static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
     p_bridge = GetBridge( p_stream );
     if ( p_bridge == NULL )
     {
-        libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
+        vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
         vlc_value_t val;
 
         p_bridge = malloc( sizeof( bridge_t ) );
 
-        var_Create( p_libvlc_global, "bridge-struct", VLC_VAR_ADDRESS );
+        var_Create( p_libvlc, "bridge-struct", VLC_VAR_ADDRESS );
         val.p_address = p_bridge;
-        var_Set( p_libvlc_global, "bridge-struct", val );
+        var_Set( p_libvlc, "bridge-struct", val );
 
         p_bridge->i_es_num = 0;
         p_bridge->pp_es = NULL;
@@ -268,6 +270,7 @@ static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
 
 static int DelOut( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
+    VLC_UNUSED(id);
     out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
     bridged_es_t *p_es;
 
@@ -354,7 +357,8 @@ static int OpenIn( vlc_object_t *p_this )
     config_ChainParse( p_stream, SOUT_CFG_PREFIX_IN, ppsz_sout_options_in,
                    p_stream->p_cfg );
 
-    var_Get( p_this->p_libvlc_global, "bridge-lock", &val );
+    var_Create( p_this->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
+    var_Get( p_this->p_libvlc, "bridge-lock", &val );
     p_sys->p_lock = val.p_address;
 
     var_Get( p_stream, SOUT_CFG_PREFIX_IN "id-offset", &val );
@@ -518,12 +522,12 @@ static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id,
 
     if( b_no_es )
     {
-        libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
+        vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
         for ( i = 0; i < p_bridge->i_es_num; i++ )
             free( p_bridge->pp_es[i] );
         free( p_bridge->pp_es );
         free( p_bridge );
-        var_Destroy( p_libvlc_global, "bridge-struct" );
+        var_Destroy( p_libvlc, "bridge-struct" );
     }
 
     vlc_mutex_unlock( p_sys->p_lock );