Move code out of module descriptor.

By the way, I am VERY suspicious about the use of libvlc_global for mosaic and
bridge locks

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 0487ac068d7681bef1e2bca4d2a37cb03b7d9c64..7b96856d44aa840be450bba2e7b0b99d3ee0c8b7 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -82,7 +82,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();
 
 
@@ -170,6 +169,7 @@ static int OpenOut( vlc_object_t *p_this )
     p_sys          = malloc( sizeof( out_sout_stream_sys_t ) );
     p_sys->b_inited = VLC_FALSE;
 
+    var_Create( p_this->p_libvlc_global, "bridge-lock", VLC_VAR_MUTEX );
     var_Get( p_this->p_libvlc_global, "bridge-lock", &val );
     p_sys->p_lock = val.p_address;
 
@@ -354,6 +354,7 @@ 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_Create( p_this->p_libvlc_global, "bridge-lock", VLC_VAR_MUTEX );
     var_Get( p_this->p_libvlc_global, "bridge-lock", &val );
     p_sys->p_lock = val.p_address;
 

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index e3e32fd0e2a37b010d8cf53834c9dbd2372eeac9..49008ad728a10e763fcc502daf65c45c501ebbef 100644 (file)
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -162,8 +162,6 @@ vlc_module_begin();
                      NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE );
 
     set_callbacks( Open, Close );
-
-    var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
 vlc_module_end();
 
 static const char *ppsz_sout_options[] = {
@@ -192,6 +190,7 @@ static int Open( vlc_object_t *p_this )
     p_stream->p_sys = p_sys;
     p_sys->b_inited = VLC_FALSE;
 
+    var_Create( p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
     var_Get( p_libvlc_global, "mosaic-lock", &val );
     p_sys->p_lock = val.p_address;
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 8670f46085814d9543ff47ca2581d60ba769b52f..d12a6b06501fa2b9998d416bb47d5d1466472af1 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -228,8 +228,6 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
                  VLC_FALSE );
-
-    var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
 vlc_module_end();
 
 static const char *ppsz_filter_options[] = {
@@ -308,6 +306,7 @@ static int CreateFilter( vlc_object_t *p_this )
     vlc_mutex_init( p_filter, &p_sys->lock );
     vlc_mutex_lock( &p_sys->lock );
 
+    var_Create( p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
     var_Get( p_libvlc_global, "mosaic-lock", &val );
     p_sys->p_lock = val.p_address;