* Create new types for device probing

* Beginning of core implementation

diff --git a/include/main.h b/include/main.h
index 46a2cccd93665507d2b3256065a13e378f32b185..55375520cb04e4d766db5e4eb55e5cc85e4d251d 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -33,32 +33,28 @@ struct libvlc_t
 {
     VLC_COMMON_MEMBERS
 
-    /* Initialization boolean */
-    vlc_bool_t             b_ready;
-
-    /* CPU extensions */
-    uint32_t               i_cpu;
-
-    /* Generic settings */
-    int                    i_verbose;                       /* info messages */
-    vlc_bool_t             b_color;                       /* color messages? */
+    vlc_bool_t             b_ready;     ///< Initialization boolean
+    uint32_t               i_cpu;       ///< CPU extensions
+    
+    int                    i_verbose;   ///< info messages
+    vlc_bool_t             b_color;     ///< color messages?
 
     /* Object structure data */
-    int                    i_counter;                      /* object counter */
-    int                    i_objects;              /* Attached objects count */
-    vlc_object_t **        pp_objects;               /* Array of all objects */
+    int                    i_counter;   ///< object counter
+    int                    i_objects;   ///< Attached objects count
+    vlc_object_t **        pp_objects;  ///< Array of all objects 
+
+    msg_bank_t             msg_bank;    ///< The message bank
 
-    /* The message bank */
-    msg_bank_t             msg_bank;
+    module_bank_t *        p_module_bank; ///< The module bank
 
-    /* The module bank */
-    module_bank_t *        p_module_bank;
+    vlc_bool_t             b_stats;         ///< Should we collect stats
+    /* Timers handling */
+    vlc_mutex_t            timer_lock;      ///< Lock to protect timers
+    int                    i_timers;        ///< Number of timers
+    counter_t            **pp_timers;       ///< Array of all timers
 
-    /* Do stats ? - We keep this boolean to avoid unneeded lookups */
-    vlc_bool_t             b_stats;
-    vlc_mutex_t            timer_lock;
-    int                    i_timers;
-    counter_t            **pp_timers;
+    intf_thread_t         *p_probe;         ///< Devices prober
 
     /* Arch-specific variables */
 #if !defined( WIN32 )

diff --git a/include/vlc_common.h b/include/vlc_common.h
index ed4da001f3bc0f8e0a0e4d4136ac430375ab63ee..f2da04aa0a577de982be9a343bad05702531bab6 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -356,6 +356,8 @@ typedef struct vlc_acl_t vlc_acl_t;
 /* Misc */
 typedef struct iso639_lang_t iso639_lang_t;
 typedef struct device_t device_t;
+typedef struct device_probe_t device_probe_t;
+typedef struct probe_sys_t probe_sys_t;
 
 /* block */
 typedef struct block_t      block_t;

diff --git a/include/vlc_devices.h b/include/vlc_devices.h
index 4fe59dd9f69f30416e46d78c6020a0d87f5594cc..f503a4d90c3d00007a0002655f1ec03c257629e7 100644 (file)
--- a/include/vlc_devices.h
+++ b/include/vlc_devices.h
@@ -46,6 +46,16 @@ struct device_t
     char *psz_name;
 };
 
+struct device_probe_t
+{
+    VLC_COMMON_MEMBERS;
+    int         i_devices;
+    device_t  **pp_devices;
+
+    probe_sys_t *p_sys;
+    void      ( *pf_run )    ( device_probe_t * );  /** Run function */
+};
+
 static inline void device_GetDVD()
 {}
 

diff --git a/modules/misc/probe/hal.c b/modules/misc/probe/hal.c
index 3e340489d4f2a035d6b83a2eaaac23c725e87f74..4bed0c382d3a33b1b368b52df827be721c568d7e 100644 (file)
--- a/modules/misc/probe/hal.c
+++ b/modules/misc/probe/hal.c
@@ -30,7 +30,7 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-struct intf_sys_t
+struct probe_sys_t
 {
     LibHalContext *p_ctx;
     int            i_devices;
@@ -40,10 +40,10 @@ struct intf_sys_t
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-static void Update ( intf_thread_t *p_intf );
-static void UpdateMedia( intf_thread_t *p_intf, device_t *p_dev );
-static void AddDevice( intf_thread_t * p_intf, device_t *p_dev );
-static device_t * ParseDisc( intf_thread_t *p_intf,  char *psz_device );
+static void Update ( device_probe_t *p_probe );
+static void UpdateMedia( device_probe_t *p_probe, device_t *p_dev );
+static void AddDevice( device_probe_t * p_probe, device_t *p_dev );
+static device_t * ParseDisc( device_probe_t *p_probe,  char *psz_device );
 
 /*****************************************************************************
  * Module descriptor
@@ -60,38 +60,38 @@ vlc_module_end();
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
+    device_probe_t *p_probe = (device_probe_t *)p_this;
     DBusError           dbus_error;
     DBusConnection      *p_connection;
-    intf_sys_t          *p_sys;
+    probe_sys_t          *p_sys;
 
-    p_intf->p_sys = p_sys = (intf_sys_t*)malloc( sizeof( intf_sys_t ) );
-    p_intf->p_sys->i_devices = 0;
-    p_intf->p_sys->pp_devices = NULL;
+    p_probe->p_sys = p_sys = (probe_sys_t*)malloc( sizeof( probe_sys_t ) );
+    p_probe->p_sys->i_devices = 0;
+    p_probe->p_sys->pp_devices = NULL;
 
-    p_intf->pf_run = Update;
+    p_probe->pf_run = Update;
 
     dbus_error_init( &dbus_error );
 
     p_sys->p_ctx = libhal_ctx_new();
     if( !p_sys->p_ctx )
     {
-        msg_Err( p_intf, "unable to create HAL context") ;
-        free( p_intf->p_sys );
+        msg_Err( p_probe, "unable to create HAL context") ;
+        free( p_probe->p_sys );
         return VLC_EGENERIC;
     }
     p_connection = dbus_bus_get( DBUS_BUS_SYSTEM, &dbus_error );
     if( dbus_error_is_set( &dbus_error ) )
     {
-        msg_Err( p_intf, "unable to connect to DBUS: %s", dbus_error.message );
+        msg_Err( p_probe, "unable to connect to DBUS: %s", dbus_error.message );
         dbus_error_free( &dbus_error );
-        free( p_intf->p_sys );
+        free( p_probe->p_sys );
         return VLC_EGENERIC;
     }
-    libhal_ctx_set_dbus_connection( p_intf->p_sys->p_ctx, p_connection );
-    if( !libhal_ctx_init( p_intf->p_sys->p_ctx, &dbus_error ) )
+    libhal_ctx_set_dbus_connection( p_probe->p_sys->p_ctx, p_connection );
+    if( !libhal_ctx_init( p_probe->p_sys->p_ctx, &dbus_error ) )
     {
-        msg_Err( p_intf, "hal not available : %s", dbus_error.message );
+        msg_Err( p_probe, "hal not available : %s", dbus_error.message );
         dbus_error_free( &dbus_error );
         free( p_sys );
         return VLC_EGENERIC;
@@ -104,20 +104,20 @@ static int Open( vlc_object_t *p_this )
  *****************************************************************************/
 static void Close( vlc_object_t *p_this )
 {
-    intf_thread_t *p_intf = (intf_thread_t *) p_this;
-    intf_sys_t *p_sys = p_intf->p_sys;
+    device_probe_t *p_probe = (device_probe_t *) p_this;
+    probe_sys_t *p_sys = p_probe->p_sys;
     free( p_sys );
 }
 
-static int GetAllDevices( intf_thread_t *p_intf, device_t ***ppp_devices )
+static int GetAllDevices( device_probe_t *p_probe, device_t ***ppp_devices )
 {
     /// \todo : fill the dst array 
-    return p_intf->p_sys->i_devices;
+    return p_probe->p_sys->i_devices;
 }
 
-static void Update( intf_thread_t * p_intf )
+static void Update( device_probe_t * p_probe )
 {
-    intf_sys_t *p_sys = p_intf->p_sys;
+    probe_sys_t *p_sys = p_probe->p_sys;
     int i, i_devices, j;
     char **devices;
     vlc_bool_t b_exists;
@@ -132,7 +132,7 @@ static void Update( intf_thread_t * p_intf )
     {
         for( i = 0; i < i_devices; i++ )
         {
-            device_t *p_dev = ParseDisc( p_intf, devices[ i ] );
+            device_t *p_dev = ParseDisc( p_probe, devices[ i ] );
             b_exists = VLC_FALSE;
 
             for ( j = 0 ; j < p_sys->i_devices; j++ )
@@ -142,11 +142,11 @@ static void Update( intf_thread_t * p_intf )
                 {
                     b_exists = VLC_TRUE;
                     p_dev->b_seen = VLC_TRUE;
-                    UpdateMedia( p_intf, p_dev );
+                    UpdateMedia( p_probe, p_dev );
                     break;
                 }
                 if( !b_exists )
-                    AddDevice( p_intf, p_dev );
+                    AddDevice( p_probe, p_dev );
             }
         }
     }
@@ -154,18 +154,18 @@ static void Update( intf_thread_t * p_intf )
 }
 
 
-static void AddDevice( intf_thread_t * p_intf, device_t *p_dev )
+static void AddDevice( device_probe_t * p_probe, device_t *p_dev )
 {
-    INSERT_ELEM( p_intf->p_sys->pp_devices,
-                 p_intf->p_sys->i_devices,
-                 p_intf->p_sys->i_devices,
+    INSERT_ELEM( p_probe->p_sys->pp_devices,
+                 p_probe->p_sys->i_devices,
+                 p_probe->p_sys->i_devices,
                  p_dev );
     /// \todo : emit variable
 }
 
-static device_t * ParseDisc( intf_thread_t *p_intf,  char *psz_device )
+static device_t * ParseDisc( device_probe_t *p_probe,  char *psz_device )
 {
-    intf_sys_t *p_sys = p_intf->p_sys;
+    probe_sys_t *p_sys = p_probe->p_sys;
     device_t *p_dev;
     char *block_dev;
     dbus_bool_t b_dvd;
@@ -193,13 +193,13 @@ static device_t * ParseDisc( intf_thread_t *p_intf,  char *psz_device )
     else
         p_dev->i_capabilities = DEVICE_CAN_CD;
 
-    UpdateMedia( p_intf, p_dev );
+    UpdateMedia( p_probe, p_dev );
     return p_dev;
 }
 
-static void UpdateMedia( intf_thread_t *p_intf, device_t *p_dev )
+static void UpdateMedia( device_probe_t *p_probe, device_t *p_dev )
 {
-    intf_sys_t *p_sys = p_intf->p_sys;
+    probe_sys_t *p_sys = p_probe->p_sys;
     char **matching_media;
     int i_matching, i;
     vlc_bool_t b_changed = VLC_FALSE;;

diff --git a/src/Makefile.am b/src/Makefile.am
index 89f0b0eb2a9c78375678d3b883ecf51721360eae..7de89bd139b8401e74357a1f449fcb5077a7b65a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -322,6 +322,7 @@ SOURCES_libvlc_common = \
        misc/vlm.c \
        misc/xml.c \
        misc/hashtables.c \
+       misc/devices.c \
        extras/libc.c \
        control/core.c \
        control/playlist.c \