Changeset 2e0409a12910ea5ee7a314501b6c11fe9689fe79

Timestamp:

20/05/07 12:03:51 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1179655431 +0000

git-parent:

[c262bd272894498e7a14160437c58aa0d753a587]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1179655431 +0000

Message:

Hide libvlc_global_data_t from plugins

Files:

• include/main.h (modified) (1 diff)
• include/vlc_common.h (modified) (1 diff)
• modules/codec/ffmpeg/ffmpeg.c (modified) (3 diffs)
• modules/control/http/http.c (modified) (2 diffs)
• modules/stream_out/bridge.c (modified) (3 diffs)
• modules/stream_out/mosaic_bridge.c (modified) (3 diffs)
• modules/video_filter/mosaic.c (modified) (1 diff)
• modules/video_filter/mosaic.h (modified) (1 diff)
• src/libvlc-common.c (modified) (4 diffs)
• src/libvlc.h (modified) (2 diffs)
• src/misc/objects.c (modified) (11 diffs)
• src/modules/modules.c (modified) (22 diffs)

include/main.h

@@ -26 +26 @@
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
-/*****************************************************************************
- * libvlc_global_data_t (global variable)
- *****************************************************************************
- * This structure has an unique instance, statically allocated in main and
- * never accessed from the outside. It stores once-initialized data such as
- * the CPU capabilities or the global lock.
- *****************************************************************************/
-struct libvlc_global_data_t
-{
-    VLC_COMMON_MEMBERS
-
-    vlc_bool_t             b_ready;     ///< Initialization boolean
-    uint32_t               i_cpu;       ///< CPU extensions
-
-   /* Object structure data */
-    int                    i_counter;   ///< object counter
-    int                    i_objects;   ///< Attached objects count
-    vlc_object_t **        pp_objects;  ///< Array of all objects
-
-    module_bank_t *        p_module_bank; ///< The module bank
-    intf_thread_t         *p_probe;       ///< Devices prober
-
-    /* Arch-specific variables */
-#if !defined( WIN32 )
-    vlc_bool_t             b_daemon;
-#endif
-#if defined( SYS_BEOS )
-    vlc_object_t *         p_appthread;
-    char *                 psz_vlcpath;
-#elif defined( __APPLE__ )
-    char *                 psz_vlcpath;
-    vlc_iconv_t            iconv_macosx; /* for HFS+ file names */
-    vlc_mutex_t            iconv_lock;
-#elif defined( WIN32 ) && !defined( UNDER_CE )
-    SIGNALOBJECTANDWAIT    SignalObjectAndWait;
-    vlc_bool_t             b_fast_mutex;
-    int                    i_win9x_cv;
-    char *                 psz_vlcpath;
-#elif defined( UNDER_CE )
-    char *                 psz_vlcpath;
-#endif
-};
-
-/*****************************************************************************

include/vlc_common.h

@@ -567 +567 @@
-                                                                            \
-    /* Stuff related to the libvlc structure */                             \
-libvlc_global_data_t *p_libvlc_global;
+vlc_object_t *p_libvlc_global;        
-    libvlc_int_t *p_libvlc;                  /**< (root of all evil) - 1 */ \
-                                                                            \

modules/codec/ffmpeg/ffmpeg.c

@@ -235 +235 @@
-#endif
-
-
-
+
-
-vlc_module_end();
@@ -340 +339 @@
-    vlc_value_t lockval;
-
-(vlc_object_t *)
+
-
-    switch( p_sys->i_cat )
@@ -429 +428 @@
-    vlc_value_t lockval;
-
-(vlc_object_t *)
+
-    vlc_mutex_lock( lockval.p_address );
-

modules/control/http/http.c

@@ -126 +126 @@
-    char          *psz_src;
-
-_global
-=var_GetString(p_intf->p_libvlc_global
+
+ = var_GetString(p_intf->p_libvlc
-    if( !psz_address || !*psz_address )
-    {
@@ -282 +282 @@
-        /* Ugly hack to run several HTTP servers on different ports */
-        snprintf( psz_tmp, sizeof (psz_tmp), "%s:%d", psz_address, i_port + 1 );
-_global
+
-    }
-

modules/stream_out/bridge.c

@@ -128 +128 @@
-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;
-
-libvlc_global, "bridge-struct", &val ) != VLC_SUCCESS
+object->p_libvlc_global, "bridge-struct", &val )
-    {
-        p_bridge = NULL;
@@ -220 +219 @@
-    if ( p_bridge == NULL )
-    {
-libvlc_global_data
+vlc_object
-        vlc_value_t val;
-
@@ -520 +519 @@
-    if( b_no_es )
-    {
-libvlc_global_data
+vlc_object
-        for ( i = 0; i < p_bridge->i_es_num; i++ )
-            free( p_bridge->pp_es[i] );

modules/stream_out/mosaic_bridge.c

@@ -178 +178 @@
-    sout_stream_t        *p_stream = (sout_stream_t *)p_this;
-    sout_stream_sys_t    *p_sys;
-libvlc_global_data_t
+vlc_object_t        
-    vlc_value_t           val;
-
@@ -318 +318 @@
-    if ( p_bridge == NULL )
-    {
-libvlc_global_data
+vlc_object
-        vlc_value_t val;
-
@@ -499 +499 @@
-    if ( b_last_es )
-    {
-libvlc_global_data
+vlc_object
-        for ( i = 0; i < p_bridge->i_es_num; i++ )
-            free( p_bridge->pp_es[i] );

modules/video_filter/mosaic.c

@@ -287 +287 @@
-    filter_t *p_filter = (filter_t *)p_this;
-    filter_sys_t *p_sys;
-libvlc_global_data
+vlc_object
-    char *psz_order;
-    char *psz_offsets;

modules/video_filter/mosaic.h

@@ -41 +41 @@
-static bridge_t *__GetBridge( vlc_object_t *p_object )
-{
-libvlc_global_data
+vlc_object
-    bridge_t *p_bridge;
-    vlc_value_t val;

src/libvlc-common.c

@@ -370 +370 @@
-            b_exit = VLC_TRUE;
-        }
-p_libvlc->p_libvlc_global->
+libvlc_global.
-
-        /* lets check if we need to write the pidfile */
@@ -417 +417 @@
-            close( STDERR_FILENO );
-
-p_libvlc->p_libvlc_global->
+libvlc_global.
-        }
-#endif
@@ -1040 +1040 @@
-    char* psz_pidfile = NULL;
-
-p_libvlc->p_libvlc_global->
+libvlc_global.
-    if( config_GetInt( p_libvlc, "daemon" ) )
-    {
@@ -1118 +1118 @@
-
-#ifndef WIN32
-p_libvlc->p_libvlc_global->
+libvlc_global.
-    {
-        /* Daemon mode hack.

src/libvlc.h

@@ -35 +35 @@
-                   const char *psz_type);
-
-#if 0
-/*****************************************************************************
- * libvlc_global_data_t (global variable)
@@ -72 +71 @@
-#endif
-};
-#endif
-
+static inline libvlc_global_data_t *vlc_global( vlc_object_t *p_this )
+{
+    return (libvlc_global_data_t *)p_this->p_libvlc_global;
+}
-
-extern uint32_t cpu_flags;

src/misc/objects.c

@@ -140 +140 @@
-    {
-        /* If i_type is global, then p_new is actually p_libvlc_global */
-
+
+
-        p_new->p_libvlc = NULL;
-
-new->p_
+
-        p_new->i_object_id = 0;
-
-new->p_
-new->p_
-new->p_
+
+
+
-        p_new->b_attached = VLC_TRUE;
-    }
-    else
-    {
-
+
+
-        p_new->p_libvlc = ( i_type == VLC_OBJECT_LIBVLC ) ? (libvlc_int_t*)p_new
-                                                       : p_this->p_libvlc;
@@ -159 +161 @@
-        vlc_mutex_lock( &structure_lock );
-
-new->p_
-new->p_
+
+
-
-        /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
-         * useless to try and recover anything if pp_objects gets smashed. */
-
-
+
-                    p_new );
-
@@ -396 +397 @@
-    if( p_this->i_object_type == VLC_OBJECT_GLOBAL )
-    {
+        libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
-        /* We are the global object ... no need to lock. */
-this->p_libvlc_
-this->p_libvlc_
-this->p_libvlc_
+
+
+
-
-        vlc_mutex_destroy( &structure_lock );
@@ -405 +407 @@
-    else
-    {
+        libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
-        int i_index;
-
@@ -411 +414 @@
-        /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
-         * useless to try and recover anything if pp_objects gets smashed. */
-this->p_
-this->p_
-this->p_
-this->p_
+
+
+
+
-
-        vlc_mutex_unlock( &structure_lock );
@@ -466 +469 @@
-    int i_max, i_middle;
-    vlc_object_t **pp_objects;
+    libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
-
-    vlc_mutex_lock( &structure_lock );
-
-this->p_
+
-
-    /* Perform our dichotomy */
-this->p_
+
-    {
-        i_middle = i_max / 2;
@@ -714 +718 @@
-    vlc_object_t **pp_current, **pp_end;
-    int i_count = 0, i_index = 0;
+    libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
-
-    vlc_mutex_lock( &structure_lock );
@@ -721 +726 @@
-    {
-    case FIND_ANYWHERE:
-this->p_
-this->p_
+
+
-
-        for( ; pp_current < pp_end ; pp_current++ )
@@ -734 +739 @@
-
-        p_list = NewList( i_count );
-this->p_
+
-
-        for( ; pp_current < pp_end ; pp_current++ )
@@ -784 +789 @@
-                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
+    libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
+
-    (void)oldval; (void)p_data;
-    if( *psz_cmd == 'l' )
@@ -791 +798 @@
-        vlc_object_t **pp_current, **pp_end;
-
-this->p_
-this->p_
+
+
-
-        for( ; pp_current < pp_end ; pp_current++ )

src/modules/modules.c

@@ -156 +156 @@
-static void module_LoadMain( vlc_object_t *p_this );
-
-
-/* Sub-version number
- * (only used to avoid breakage in dev version when cache structure changes) */
@@ -171 +170 @@
-    module_bank_t *p_bank = NULL;
-    vlc_value_t  lockval;
-
-
-
+
+
+
+
-    vlc_mutex_lock( lockval.p_address );
-this->p_
-
-this->p_
+
+
+
-        vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-        return;
-    }
-    vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-
-    p_bank = vlc_object_create( p_this, sizeof(module_bank_t) );
@@ -203 +203 @@
-
-    /* Everything worked, attach the object */
-this->p_
-this->p_
+
+
-
-    module_LoadMain( p_this );
-}
-
-/*****************************************************************************
- * module_ResetBank: reset the module bank.
- *****************************************************************************
- * This function resets the module bank by unloading all unused plugin
- * modules.
- *****************************************************************************/
-void __module_ResetBank( vlc_object_t *p_this )
-{
-    msg_Err( p_this, "FIXME: module_ResetBank unimplemented" );
-    return;
-}
-
-/*****************************************************************************
@@ -231 +220 @@
-    module_t * p_next = NULL;
-    vlc_value_t lockval;
-
-
-
+
+
+
+
-    vlc_mutex_lock( lockval.p_address );
-this->p_
+
-    {
-        vlc_mutex_unlock( lockval.p_address );
-this->p_
-
-
-this->p_
+
+
+
+
-    {
-        vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-        return;
-    }
-    vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-
-    config_AutoSaveConfigFile( p_this );
-
-#ifdef HAVE_DYNAMIC_PLUGINS
-define p_bank p_this->
+ define p_bank 
-    if( p_bank->b_cache ) CacheSave( p_this );
-    while( p_bank->i_loaded_cache-- )
@@ -259 +249 @@
-        if( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] )
-        {
-
+
+
-            free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file );
-            free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] );
@@ -281 +272 @@
-        p_bank->pp_cache = NULL;
-    }
-
-
-
-this->p_
-
-this->p_
-
-this->p_
+ 
+
+
+
+
+
+
+
-
-        if( DeleteModule( p_next, VLC_TRUE ) )
@@ -302 +293 @@
-    }
-
-
-
-
-
+
+
-}
-
@@ -319 +308 @@
-{
-    vlc_value_t lockval;
-
-
-
+
+
+
+
-    vlc_mutex_lock( lockval.p_address );
-this->p_
+
-    {
-        vlc_mutex_unlock( lockval.p_address );
-this->p_
-
-
-this->p_
+
+
+
+
-    vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-
-    AllocateBuiltinModule( p_this, vlc_entry__main );
@@ -344 +334 @@
-{
-    vlc_value_t lockval;
-
-
-
+
+
+
+
-    vlc_mutex_lock( lockval.p_address );
-this->p_
+
-    {
-        vlc_mutex_unlock( lockval.p_address );
-this->p_
-
-
-this->p_
+
+
+
+
-    vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-
-    msg_Dbg( p_this, "checking builtin modules" );
@@ -371 +362 @@
-#ifdef HAVE_DYNAMIC_PLUGINS
-    vlc_value_t lockval;
-
-
-
+
+
+
+
-    vlc_mutex_lock( lockval.p_address );
-this->p_
+
-    {
-        vlc_mutex_unlock( lockval.p_address );
-this->p_
-
-
-this->p_
+
+
+
+
-    vlc_mutex_unlock( lockval.p_address );
-this->p_
+
-
-    msg_Dbg( p_this, "checking plugin modules" );
-
-    if( config_GetInt( p_this, "plugins-cache" ) )
-this->p_
-
-this->p_
-this->p_
+
+
+
+
-
-    AllocateAllPlugins( p_this );
@@ -1074 +1066 @@
-    if( p_module )
-    {
+        libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
+
-        /* Everything worked fine !
-         * The module is ready to be added to the list. */
@@ -1081 +1075 @@
-                    p_module->psz_object_name, p_module->psz_longname ); */
-
-this->p_
-
-this->p_
+
+
+
-            return 0;
-
+#define p_bank p_libvlc_global->p_module_bank
-        /* Add entry to cache */
-#define p_bank p_this->p_libvlc_global->p_module_bank
-        p_bank->pp_cache =
-            realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) );
@@ -1257 +1251 @@
-                p_module->psz_object_name, p_module->psz_longname ); */
-
-p_this->p_libvlc_global
+vlc_global( p_this )
-
-    return 0;
@@ -1633 +1627 @@
-    module_cache_t **pp_cache = 0;
-    int32_t i_file_size, i_marker;
+    libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
-
-    psz_homedir = p_this->p_libvlc->psz_homedir;
@@ -1649 +1644 @@
-    }
-
-this->p_
+
-    {
-#if !defined( UNDER_CE )
@@ -1738 +1733 @@
-    }
-
-this->p_
+
-    if (fread( &i_cache, 1, sizeof(i_cache), file ) != sizeof(i_cache) )
-    {
@@ -1748 +1743 @@
-
-    if( i_cache )
-this->p_
+
-                   malloc( i_cache * sizeof(void *) );
-
@@ -1779 +1774 @@
-
-        pp_cache[i] = malloc( sizeof(module_cache_t) );
-this->p_
+
-
-        /* Load common info */
@@ -1845 +1840 @@
-
-    /* TODO: cleanup */
-this->p_
+
-
-    fclose( file );
@@ -1986 +1981 @@
-    module_cache_t **pp_cache;
-    int32_t i_file_size = 0;
+    libvlc_global_data_t *p_libvlc_global = vlc_global( p_this );
-
-    psz_homedir = p_this->p_libvlc->psz_homedir;
@@ -2053 +2049 @@
-    fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
-
-this->p_
-this->p_
+
+
-
-    fwrite( &i_cache, sizeof(char), sizeof(i_cache), file );
@@ -2238 +2234 @@
-    module_cache_t **pp_cache;
-    int i_cache, i;
-
-
-
+
+
+
+
-
-    for( i = 0; i < i_cache; i++ )