]> git.sesse.net Git - vlc/blobdiff - modules/services_discovery/hal.c
Removes trailing spaces. Removes tabs.
[vlc] / modules / services_discovery / hal.c
index f40b33b770e856e2ec4d91056d2ab6d801076450..5b84eeced6ebf02a60f2ba62599e5b6ea8680fc8 100644 (file)
@@ -1,10 +1,12 @@
 /*****************************************************************************
- * sap.c :  SAP interface module
+ * hal.c :  HAL interface module
  *****************************************************************************
  * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2006 Rafaël Carré
  * $Id$
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Rafaël Carré <funman at videolanorg>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Includes
- *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
 
-#include <vlc/input.h>
-
-#include "network.h"
+#include <vlc_network.h>
 
 #include <errno.h>                                                 /* ENOMEM */
 
 
 #include <hal/libhal.h>
 
-/************************************************************************
- * Macros and definitions
- ************************************************************************/
-
 #define MAX_LINE_LENGTH 256
 
-
 /*****************************************************************************
- * Module descriptor
+ * Local prototypes
  *****************************************************************************/
+#ifdef HAVE_HAL_1
+/* store relation between item id and udi for ejection */
+struct udi_input_id_t
+{
+    char    *psz_udi;
+    int     i_id;
+};
+#endif
+
+struct services_discovery_sys_t
+{
+    LibHalContext           *p_ctx;
+    playlist_item_t         *p_node_cat;
+    playlist_item_t         *p_node_one;
+#ifdef HAVE_HAL_1
+    DBusConnection          *p_connection;
+    int                     i_devices_number;
+    struct udi_input_id_t   **pp_devices;
+#endif
+};
+static void Run    ( services_discovery_t *p_intf );
 
-/* Callbacks */
-    static int  Open ( vlc_object_t * );
-    static void Close( vlc_object_t * );
+static int  Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
 
+#ifdef HAVE_HAL_1
+/* HAL callbacks */
+void DeviceAdded( LibHalContext *p_ctx, const char *psz_udi );
+void DeviceRemoved( LibHalContext *p_ctx, const char *psz_udi );
+/* to retrieve p_sd in HAL callbacks */
+services_discovery_t        *p_sd_global;
+#endif
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
 vlc_module_begin();
-    set_description( _("HAL device detection") );
+    set_description( _("HAL devices detection") );
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_SD );
 
@@ -70,26 +91,6 @@ vlc_module_begin();
 vlc_module_end();
 
 
-/*****************************************************************************
- * Local structures
- *****************************************************************************/
-
-struct services_discovery_sys_t
-{
-    LibHalContext *p_ctx;
-
-    /* playlist node */
-    playlist_item_t *p_node;
-
-};
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-
-/* Main functions */
-    static void Run    ( services_discovery_t *p_intf );
-
 /*****************************************************************************
  * Open: initialize and create stuff
  *****************************************************************************/
@@ -99,46 +100,66 @@ static int Open( vlc_object_t *p_this )
     services_discovery_sys_t *p_sys  = malloc(
                                     sizeof( services_discovery_sys_t ) );
 
-    vlc_value_t         val;
     playlist_t          *p_playlist;
-    playlist_view_t     *p_view;
 
+#ifdef HAVE_HAL_1
     DBusError           dbus_error;
     DBusConnection      *p_connection;
 
+    p_sd_global = p_sd;
+    p_sys->i_devices_number = 0;
+    p_sys->pp_devices = NULL;
+#endif
+
     p_sd->pf_run = Run;
     p_sd->p_sys  = p_sys;
 
+#ifdef HAVE_HAL_1
     dbus_error_init( &dbus_error );
 
-#ifdef HAVE_HAL_1
     p_sys->p_ctx = libhal_ctx_new();
     if( !p_sys->p_ctx )
     {
-        msg_Err( p_sd, "Unable to create HAL context") ;
+        msg_Err( p_sd, "unable to create HAL context") ;
         free( 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_sd, "Unable to connect to DBUS: %s", dbus_error.message );
+        msg_Err( p_sd, "unable to connect to DBUS: %s", dbus_error.message );
         dbus_error_free( &dbus_error );
         free( p_sys );
         return VLC_EGENERIC;
     }
     libhal_ctx_set_dbus_connection( p_sys->p_ctx, p_connection );
+    p_sys->p_connection = p_connection;
     if( !libhal_ctx_init( p_sys->p_ctx, &dbus_error ) )
 #else
     if( !(p_sys->p_ctx = hal_initialize( NULL, FALSE ) ) )
 #endif
     {
+#ifdef HAVE_HAL_1
         msg_Err( p_sd, "hal not available : %s", dbus_error.message );
         dbus_error_free( &dbus_error );
+#else
+        msg_Err( p_sd, "hal not available" );
+#endif
         free( p_sys );
         return VLC_EGENERIC;
     }
 
+#ifdef HAVE_HAL_1
+        if( !libhal_ctx_set_device_added( p_sys->p_ctx, DeviceAdded ) ||
+                !libhal_ctx_set_device_removed( p_sys->p_ctx, DeviceRemoved ) )
+        {
+            msg_Err( p_sd, "unable to add callback" );
+            dbus_error_free( &dbus_error );
+            free( p_sys );
+            return VLC_EGENERIC;
+        }
+#endif
+
     /* Create our playlist node */
     p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
                                                 FIND_ANYWHERE );
@@ -148,14 +169,9 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
-    p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
-                                         _("Devices"), p_view->p_root );
-
-    p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
-    val.b_bool = VLC_TRUE;
-    var_Set( p_playlist, "intf-change", val );
-
+    playlist_NodesPairCreate( p_playlist, _("Devices"),
+                              &p_sys->p_node_cat, &p_sys->p_node_one,
+                              VLC_TRUE );
     vlc_object_release( p_playlist );
 
     return VLC_SUCCESS;
@@ -172,10 +188,65 @@ static void Close( vlc_object_t *p_this )
                                  VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
     if( p_playlist )
     {
-        playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
+        playlist_NodeDelete( p_playlist, p_sys->p_node_cat, VLC_TRUE,VLC_TRUE );
+        playlist_NodeDelete( p_playlist, p_sys->p_node_one, VLC_TRUE,VLC_TRUE );
         vlc_object_release( p_playlist );
     }
     free( p_sys );
+#ifdef HAVE_HAL_1
+    dbus_connection_unref( p_sys->p_connection );
+
+    struct udi_input_id_t *p_udi_entry;
+
+    while( p_sys->i_devices_number > 0 )
+    {
+        p_udi_entry = p_sys->pp_devices[0];
+        if( p_udi_entry->psz_udi ) free( p_udi_entry->psz_udi );
+        TAB_REMOVE( p_sys->i_devices_number, p_sys->pp_devices,
+                p_sys->pp_devices[0] );
+        if( p_udi_entry ) free( p_udi_entry );
+    }
+    p_sys->pp_devices = NULL;
+#endif
+}
+
+static void AddItem( services_discovery_t *p_sd, input_item_t * p_input
+#ifdef HAVE_HAL_1
+                ,char* psz_device
+#endif
+                    )
+{
+    playlist_item_t *p_item_cat, *p_item_one;
+    services_discovery_sys_t *p_sys  = p_sd->p_sys;
+    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_sd,
+                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    if( !p_playlist )
+    {
+        msg_Err( p_sd, "playlist not found" );
+        return;
+    }
+    p_item_cat = playlist_NodeAddInput( p_playlist,
+            p_input,p_sd->p_sys->p_node_cat, PLAYLIST_APPEND, PLAYLIST_END,
+            VLC_FALSE );
+    p_item_cat->i_flags &= ~PLAYLIST_SKIP_FLAG;
+    p_item_one = playlist_NodeAddInput( p_playlist,
+            p_input,p_sd->p_sys->p_node_one, PLAYLIST_APPEND, PLAYLIST_END,
+            VLC_FALSE );
+    p_item_one->i_flags &= ~PLAYLIST_SKIP_FLAG;
+
+    vlc_object_release( p_playlist );
+
+#ifdef HAVE_HAL_1
+    struct udi_input_id_t *p_udi_entry;
+    p_udi_entry = malloc( sizeof( struct udi_input_id_t ) );
+    if( !p_udi_entry )
+    {
+        return;
+    }
+    p_udi_entry->i_id = p_item_cat->i_id;
+    p_udi_entry->psz_udi = strdup( psz_device );
+    TAB_APPEND( p_sys->i_devices_number, p_sys->pp_devices, p_udi_entry );
+#endif
 }
 
 static void AddDvd( services_discovery_t *p_sd, char *psz_device )
@@ -183,9 +254,7 @@ static void AddDvd( services_discovery_t *p_sd, char *psz_device )
     char *psz_name;
     char *psz_uri;
     char *psz_blockdevice;
-    services_discovery_sys_t    *p_sys  = p_sd->p_sys;
-    playlist_t          *p_playlist;
-    playlist_item_t     *p_item;
+    input_item_t        *p_input;
 #ifdef HAVE_HAL_1
     psz_name = libhal_device_get_property_string( p_sd->p_sys->p_ctx,
                                         psz_device, "volume.label", NULL );
@@ -199,41 +268,75 @@ static void AddDvd( services_discovery_t *p_sd, char *psz_device )
 #endif
     asprintf( &psz_uri, "dvd://%s", psz_blockdevice );
     /* Create the playlist item here */
-    p_item = playlist_ItemNew( p_sd, psz_uri,
-                               psz_name );
+    p_input = input_ItemNew( p_sd, psz_uri, psz_name );
     free( psz_uri );
-#ifdef HAVE_HAL_1
-    libhal_free_string( psz_device );
-#else
-    hal_free_string( psz_device );
-#endif
-    if( !p_item )
+    if( !p_input )
     {
         return;
     }
-    p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-    p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
-                                                FIND_ANYWHERE );
+#ifdef HAVE_HAL_1
+    AddItem( p_sd, p_input, psz_device );
+#else
+    AddItem( p_sd, p_input );
+#endif
+}
+
+#ifdef HAVE_HAL_1
+static void DelItem( services_discovery_t *p_sd, char* psz_udi )
+{
+    services_discovery_sys_t    *p_sys  = p_sd->p_sys;
+    int                         i,j;
+    playlist_item_t             *p_pl_item;
+
+    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_sd,
+                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
     if( !p_playlist )
     {
         msg_Err( p_sd, "playlist not found" );
         return;
     }
 
-    playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY, p_sys->p_node,
-                          PLAYLIST_APPEND, PLAYLIST_END );
+    for( i = 0; i < p_sys->i_devices_number; i++ )
+    { /*  looks for a matching udi */
+        if( strcmp( psz_udi, p_sys->pp_devices[i]->psz_udi ) == 0 )
+        { /* delete the corresponding item */
+            p_pl_item = playlist_ItemGetById( p_playlist,
+                p_sys->pp_devices[i]->i_id, VLC_FALSE );
+            if( p_pl_item )
+            {
+                j = 0;
+                while( p_pl_item->i_children > 0 )
+                { /* delete all childs */
+                    playlist_DeleteFromInput( p_playlist,
+                        p_pl_item->pp_children[j]->p_input->i_id, VLC_FALSE );
+                }
+                /* delete parent item */
+
+                /* HACK: if i_children == 0 the item won't be deleted
+                 * That means that it _had_ children but they were deleted */
+                if( p_pl_item->i_children == 0 )
+                    p_pl_item->i_children = -1;
+
+                playlist_DeleteFromInput( p_playlist,
+                    p_pl_item->p_input->i_id, VLC_FALSE );
+            }
+
+            if( p_sys->pp_devices[i]->psz_udi )
+                free( p_sys->pp_devices[i]->psz_udi );
+            TAB_REMOVE( p_sys->i_devices_number, p_sys->pp_devices,
+                    p_sys->pp_devices[i] );
+        }
+    }
 
     vlc_object_release( p_playlist );
 }
+#endif
 
 static void AddCdda( services_discovery_t *p_sd, char *psz_device )
 {
-    char *psz_name = "Audio CD";
     char *psz_uri;
     char *psz_blockdevice;
-    services_discovery_sys_t    *p_sys  = p_sd->p_sys;
-    playlist_t          *p_playlist;
-    playlist_item_t     *p_item;
+    input_item_t     *p_input;
 #ifdef HAVE_HAL_1
     psz_blockdevice = libhal_device_get_property_string( p_sd->p_sys->p_ctx,
                                             psz_device, "block.device", NULL );
@@ -243,32 +346,15 @@ static void AddCdda( services_discovery_t *p_sd, char *psz_device )
 #endif
     asprintf( &psz_uri, "cdda://%s", psz_blockdevice );
     /* Create the playlist item here */
-    p_item = playlist_ItemNew( p_sd, psz_uri,
-                               psz_name );
+    p_input = input_ItemNew( p_sd, psz_uri, "Audio CD" );
     free( psz_uri );
+    if( !p_input )
+        return;
 #ifdef HAVE_HAL_1
-    libhal_free_string( psz_device );
+    AddItem( p_sd, p_input, psz_device );
 #else
-    hal_free_string( psz_device );
+    AddItem( p_sd, p_input );
 #endif
-    if( !p_item )
-    {
-        return;
-    }
-    p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-    p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
-                                                FIND_ANYWHERE );
-    if( !p_playlist )
-    {
-        msg_Err( p_sd, "playlist not found" );
-        return;
-    }
-
-    playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY, p_sys->p_node,
-                          PLAYLIST_APPEND, PLAYLIST_END );
-
-    vlc_object_release( p_playlist );
-
 }
 
 static void ParseDevice( services_discovery_t *p_sd, char *psz_device )
@@ -291,11 +377,17 @@ static void ParseDevice( services_discovery_t *p_sd, char *psz_device )
                                                         psz_device,
                                                         "volume.disc.type" );
 #endif
-        if( !strcmp( psz_disc_type, "dvd_rom" ) )
+        if( !strncmp( psz_disc_type, "dvd_r", 5 ) )
         {
+#ifdef HAVE_HAL_1
+            /* hal 0.2.9.7 (HAVE_HAL) has not is_videodvd
+             * but hal 0.5.0 (HAVE_HAL_1) has */
+            if (libhal_device_get_property_bool( p_sys->p_ctx, psz_device,
+                                         "volume.disc.is_videodvd", NULL ) )
+#endif
             AddDvd( p_sd, psz_device );
         }
-        else if( !strcmp( psz_disc_type, "cd_rom" ) )
+        else if( !strncmp( psz_disc_type, "cd_r", 4 ) )
         {
 #ifdef HAVE_HAL_1
             if( libhal_device_get_property_bool( p_sys->p_ctx, psz_device,
@@ -308,11 +400,6 @@ static void ParseDevice( services_discovery_t *p_sd, char *psz_device )
                 AddCdda( p_sd, psz_device );
             }
         }
-#ifdef HAVE_HAL_1
-        libhal_free_string( psz_disc_type );
-#else
-        hal_free_string( psz_disc_type );
-#endif
     }
 }
 
@@ -335,11 +422,33 @@ static void Run( services_discovery_t *p_sd )
         for( i = 0; i < i_devices; i++ )
         {
             ParseDevice( p_sd, devices[ i ] );
+#ifdef HAVE_HAL_1
+            libhal_free_string( devices[ i ] );
+#else
+            hal_free_string( devices[ i ] );
+#endif
+
         }
     }
-
+#ifdef HAVE_HAL_1
     while( !p_sd->b_die )
     {
-        msleep( 100000 );
+    /* look for events on the bus, blocking 1 second */
+    dbus_connection_read_write_dispatch( p_sys->p_connection, 1000 );
+    /* HAL 0.5.8.1 can use libhal_ctx_get_dbus_connection(p_sys->p_ctx) */
     }
+#endif
+
 }
+
+#ifdef HAVE_HAL_1
+void DeviceAdded( LibHalContext *p_ctx, const char *psz_udi )
+{
+        ParseDevice( p_sd_global, (char*) psz_udi );
+}
+void DeviceRemoved( LibHalContext *p_ctx, const char *psz_udi )
+{
+        DelItem( p_sd_global, (char*) psz_udi );
+}
+#endif
+