* hal.c : HAL interface module
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
+ * Copyright © 2006-2007 Rafaël Carré
* $Id$
*
* 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.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/input.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_playlist.h>
-#include "network.h"
+#include <vlc_network.h>
#include <errno.h> /* ENOMEM */
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
+/* store relation between item id and udi for ejection */
+struct udi_input_id_t
+{
+ char *psz_udi;
+ input_item_t *p_item;
+};
+
struct services_discovery_sys_t
{
- LibHalContext *p_ctx;
- playlist_item_t *p_node_cat;
- playlist_item_t *p_node_one;
+ LibHalContext *p_ctx;
+ DBusConnection *p_connection;
+ int i_devices_number;
+ struct udi_input_id_t **pp_devices;
};
-static void AddItem( services_discovery_t *p_sd, input_item_t * p_input );
static void Run ( services_discovery_t *p_intf );
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
+/* 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;
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("HAL devices detection") );
+ set_description( N_("HAL devices detection") );
set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD );
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
services_discovery_sys_t *p_sys = malloc(
sizeof( services_discovery_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- playlist_t *p_playlist;
-
-#if defined( HAVE_HAL_1 ) && defined( HAVE_DBUS_2 )
DBusError dbus_error;
DBusConnection *p_connection;
-#endif
+
+ p_sd_global = p_sd;
+ p_sys->i_devices_number = 0;
+ p_sys->pp_devices = NULL;
p_sd->pf_run = Run;
p_sd->p_sys = p_sys;
-#if defined( HAVE_HAL_1 ) && defined( HAVE_DBUS_2 )
dbus_error_init( &dbus_error );
p_sys->p_ctx = libhal_ctx_new();
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
{
-#if defined( HAVE_HAL_1 ) && defined( HAVE_DBUS_2 )
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;
}
- /* Create our playlist node */
- p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
+ if( !libhal_ctx_set_device_added( p_sys->p_ctx, DeviceAdded ) ||
+ !libhal_ctx_set_device_removed( p_sys->p_ctx, DeviceRemoved ) )
{
- msg_Warn( p_sd, "unable to find playlist, cancelling HAL listening");
+ msg_Err( p_sd, "unable to add callback" );
+ dbus_error_free( &dbus_error );
+ free( p_sys );
return VLC_EGENERIC;
}
- playlist_NodesPairCreate( p_playlist, _("Devices"),
- &p_sys->p_node_cat, &p_sys->p_node_one,
- VLC_TRUE );
- vlc_object_release( p_playlist );
+ services_discovery_SetLocalizedName( p_sd, _("Devices") );
return VLC_SUCCESS;
}
{
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
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 )
+
+ dbus_connection_unref( p_sys->p_connection );
+ struct udi_input_id_t *p_udi_entry;
+
+ while( p_sys->i_devices_number > 0 )
{
- 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 );
+ p_udi_entry = p_sys->pp_devices[0];
+ free( p_udi_entry->psz_udi );
+ TAB_REMOVE( p_sys->i_devices_number, p_sys->pp_devices,
+ p_sys->pp_devices[0] );
+ free( p_udi_entry );
}
+ p_sys->pp_devices = NULL;
+
free( p_sys );
}
-static void AddDvd( services_discovery_t *p_sd, char *psz_device )
+static void AddItem( services_discovery_t *p_sd, input_item_t * p_input,
+ const char* psz_device )
+{
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
+ services_discovery_AddItem( p_sd, p_input, NULL /* no category */ );
+
+ 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->psz_udi = strdup( psz_device );
+ if( !p_udi_entry->psz_udi )
+ {
+ free( p_udi_entry );
+ return;
+ }
+
+ vlc_gc_incref( p_input );
+ p_udi_entry->p_item = p_input;
+ TAB_APPEND( p_sys->i_devices_number, p_sys->pp_devices, p_udi_entry );
+}
+
+static void AddDvd( services_discovery_t *p_sd, const char *psz_device )
{
char *psz_name;
char *psz_uri;
char *psz_blockdevice;
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 );
psz_blockdevice = libhal_device_get_property_string( p_sd->p_sys->p_ctx,
psz_device, "block.device", NULL );
-#else
- psz_name = hal_device_get_property_string( p_sd->p_sys->p_ctx,
- psz_device, "volume.label" );
- psz_blockdevice = hal_device_get_property_string( p_sd->p_sys->p_ctx,
- psz_device, "block.device" );
-#endif
- asprintf( &psz_uri, "dvd://%s", psz_blockdevice );
+
+ if( asprintf( &psz_uri, "dvd://%s", psz_blockdevice ) == -1 )
+ return;
/* Create the playlist item here */
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_input )
{
return;
}
- AddItem( p_sd, p_input );
+
+ AddItem( p_sd, p_input, psz_device );
+
+ vlc_gc_decref( p_input );
}
-static void AddItem( services_discovery_t *p_sd, input_item_t * p_input )
+static void DelItem( services_discovery_t *p_sd, const char* psz_udi )
{
- playlist_item_t *p_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;
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
+
+ int i;
+ 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 */
+ services_discovery_RemoveItem( p_sd, p_sys->pp_devices[i]->p_item );
+ vlc_gc_decref( p_sys->pp_devices[i]->p_item );
+ free( p_sys->pp_devices[i]->psz_udi );
+ TAB_REMOVE( p_sys->i_devices_number, p_sys->pp_devices,
+ p_sys->pp_devices[i] );
+ }
}
- p_item = playlist_NodeAddInput( p_playlist, p_input,p_sd->p_sys->p_node_cat,
- PLAYLIST_APPEND, PLAYLIST_END );
- p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
- p_item = playlist_NodeAddInput( p_playlist, p_input,p_sd->p_sys->p_node_one,
- PLAYLIST_APPEND, PLAYLIST_END );
- p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-
- vlc_object_release( p_playlist );
}
-static void AddCdda( services_discovery_t *p_sd, char *psz_device )
+static void AddCdda( services_discovery_t *p_sd, const char *psz_device )
{
- char *psz_name = "Audio CD";
char *psz_uri;
char *psz_blockdevice;
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 );
-#else
- psz_blockdevice = hal_device_get_property_string( p_sd->p_sys->p_ctx,
- psz_device, "block.device" );
-#endif
- asprintf( &psz_uri, "cdda://%s", psz_blockdevice );
- /* Create the playlist item here */
- p_input = input_ItemNew( p_sd, psz_uri, psz_name );
+
+ if( asprintf( &psz_uri, "cdda://%s", psz_blockdevice ) == -1 )
+ return;
+ /* Create the item here */
+ p_input = input_ItemNew( p_sd, psz_uri, "Audio CD" );
free( psz_uri );
-#ifdef HAVE_HAL_1
- libhal_free_string( psz_device );
-#else
- hal_free_string( psz_device );
-#endif
if( !p_input )
return;
- AddItem( p_sd, p_input );
+
+ AddItem( p_sd, p_input, psz_device );
+
+ vlc_gc_decref( p_input );
}
-static void ParseDevice( services_discovery_t *p_sd, char *psz_device )
+static void ParseDevice( services_discovery_t *p_sd, const char *psz_device )
{
char *psz_disc_type;
services_discovery_sys_t *p_sys = p_sd->p_sys;
-#ifdef HAVE_HAL_1
- if( libhal_device_property_exists( p_sys->p_ctx, psz_device,
+
+ if( !libhal_device_property_exists( p_sys->p_ctx, psz_device,
"volume.disc.type", NULL ) )
+ return;
+
+ psz_disc_type = libhal_device_get_property_string( p_sys->p_ctx,
+ psz_device,
+ "volume.disc.type",
+ NULL );
+ if( !strncmp( psz_disc_type, "dvd_r", 5 ) )
{
- psz_disc_type = libhal_device_get_property_string( p_sys->p_ctx,
- psz_device,
- "volume.disc.type",
- NULL );
-#else
- if( hal_device_property_exists( p_sys->p_ctx, psz_device,
- "volume.disc.type" ) )
+ if (libhal_device_get_property_bool( p_sys->p_ctx, psz_device,
+ "volume.disc.is_videodvd", NULL ) )
+ AddDvd( p_sd, psz_device );
+ }
+ else if( !strncmp( psz_disc_type, "cd_r", 4 ) )
{
- psz_disc_type = hal_device_get_property_string( p_sys->p_ctx,
- psz_device,
- "volume.disc.type" );
-#endif
- if( !strcmp( psz_disc_type, "dvd_rom" ) )
- {
-#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" ) )
- {
-#ifdef HAVE_HAL_1
- if( libhal_device_get_property_bool( p_sys->p_ctx, psz_device,
- "volume.disc.has_audio" , NULL ) )
-#else
- if( hal_device_get_property_bool( p_sys->p_ctx, psz_device,
- "volume.disc.has_audio" ) )
-#endif
- {
- AddCdda( p_sd, psz_device );
- }
- }
-#ifdef HAVE_HAL_1
- libhal_free_string( psz_disc_type );
-#else
- hal_free_string( psz_disc_type );
-#endif
+ if( libhal_device_get_property_bool( p_sys->p_ctx, psz_device,
+ "volume.disc.has_audio" , NULL ) )
+ AddCdda( p_sd, psz_device );
}
}
services_discovery_sys_t *p_sys = p_sd->p_sys;
/* parse existing devices first */
-#ifdef HAVE_HAL_1
if( ( devices = libhal_get_all_devices( p_sys->p_ctx, &i_devices, NULL ) ) )
-#else
- if( ( devices = hal_get_all_devices( p_sys->p_ctx, &i_devices ) ) )
-#endif
{
for( i = 0; i < i_devices; i++ )
{
ParseDevice( p_sd, devices[ i ] );
+ libhal_free_string( devices[ i ] );
}
}
-#ifdef HAVE_DBUS_2
- /* We'll use D-Bus to listen for devices evenements */
- /* TODO: Manage hot removal of devices */
- DBusMessage* dbus_message;
- DBusMessageIter dbus_args;
- const char** psz_dbus_value;
- char* psz_dbus_device;
- DBusError dbus_error;
- DBusConnection* p_connection;
-
- dbus_error_init( &dbus_error );
-
- /* connect to the system bus */
- p_connection = dbus_bus_get( DBUS_BUS_SYSTEM, &dbus_error );
- if ( dbus_error_is_set( &dbus_error ) )
+ while( vlc_object_alive (p_sd) )
{
- msg_Err( p_sd, "D-Bus Connection Error (%s)\n", dbus_error.message);
- dbus_error_free( &dbus_error );
- return;
- }
-
- /* check for hal signals */
- dbus_bus_add_match( p_connection,
- "type='signal',interface='org.freedesktop.Hal.Manager'", &dbus_error );
- dbus_connection_flush( p_connection );
-
- /* an error ? oooh too bad :) */
- if ( dbus_error_is_set( &dbus_error ) )
- {
- msg_Err( p_sd, "D-Bus signal match Error (%s)\n", dbus_error.message);
- return;
+ /* 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) */
}
+}
- while( !p_sd->b_die )
- {
- /* read next available message */
- dbus_connection_read_write( p_connection, 0 );
- dbus_message = dbus_connection_pop_message( p_connection );
+void DeviceAdded( LibHalContext *p_ctx, const char *psz_udi )
+{
+ VLC_UNUSED(p_ctx);
+ ParseDevice( p_sd_global, psz_udi );
+}
- if( dbus_message == NULL )
- {
- /* we've worked really hard, now it's time to sleep */
- msleep( 100000 );
- continue;
- }
- /* check if the message is a signal from the correct interface */
- if( dbus_message_is_signal( dbus_message, "org.freedesktop.Hal.Manager",
- "DeviceAdded" ) )
- {
- /* read the parameter (it must be an udi string) */
- if( dbus_message_iter_init( dbus_message, &dbus_args ) &&
- ( dbus_message_iter_get_arg_type( &dbus_args ) ==
- DBUS_TYPE_STRING )
- )
- {
- dbus_message_iter_get_basic( &dbus_args, &psz_dbus_value );
- /* psz_bus_value musn't be freed, but AddCdda will do it
- * so we allocate some memory, and copy it into psz_dbus_device
- */
- psz_dbus_device = strdup( psz_dbus_value );
- ParseDevice( p_sd, psz_dbus_device );
- }
- }
- dbus_message_unref( dbus_message );
- }
-#endif
+void DeviceRemoved( LibHalContext *p_ctx, const char *psz_udi )
+{
+ VLC_UNUSED(p_ctx);
+ DelItem( p_sd_global, psz_udi );
}
projects / vlc / blobdiff