X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fhal.c;h=45b7937071f4383727e452c4886f7c255ec0eccc;hb=eaccd9ea6c0d37a380a4439b4686d69e5733e7eb;hp=e7ef04f66f8bf9801595484cdded56d629548708;hpb=5f15a425fcaacd155a301ab8324cedad2a3ea651;p=vlc diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c index e7ef04f66f..45b7937071 100644 --- a/modules/services_discovery/hal.c +++ b/modules/services_discovery/hal.c @@ -1,10 +1,12 @@ /***************************************************************************** - * sap.c : SAP interface module + * hal.c : HAL interface module ***************************************************************************** * Copyright (C) 2004 the VideoLAN team - * $Id: sap.c 9217 2004-11-07 11:02:59Z courmisch $ + * Copyright © 2006-2007 Rafaël Carré + * $Id$ * - * Authors: Clément Stenac + * Authors: Clément Stenac + * Rafaël Carré * * 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 @@ -18,20 +20,17 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * Includes - *****************************************************************************/ -#include /* malloc(), free() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include - -#include +#include -#include "network.h" +#include #include /* ENOMEM */ @@ -44,23 +43,47 @@ #include -/************************************************************************ - * 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; + input_item_t *p_item; +}; +#endif -/* Callbacks */ - static int Open ( vlc_object_t * ); - static void Close( vlc_object_t * ); +struct services_discovery_sys_t +{ + LibHalContext *p_ctx; +#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 ); + +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 +93,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,64 +102,65 @@ 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; } - /* Create our playlist node */ - p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) - { - msg_Warn( p_sd, "unable to find playlist, cancelling HAL listening"); - 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 ); +#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 - vlc_object_release( p_playlist ); + services_discovery_SetLocalizedName( p_sd, _("Devices") ); return VLC_SUCCESS; } @@ -168,24 +172,52 @@ static void Close( vlc_object_t *p_this ) { 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 ) +#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 ) { - playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE ); - vlc_object_release( p_playlist ); + 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 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 +#ifdef HAVE_HAL_1 + , const char* psz_device +#endif + ) +{ + services_discovery_sys_t *p_sys = p_sd->p_sys; + services_discovery_AddItem( p_sd, p_input, NULL /* no category */ ); + +#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; + } + vlc_gc_incref( p_input ); + p_udi_entry->p_item = p_input; + 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, const 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 ); @@ -197,43 +229,49 @@ static void AddDvd( services_discovery_t *p_sd, char *psz_device ) 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_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 ); - if( !p_playlist ) - { - msg_Err( p_sd, "playlist not found" ); - return; - } +#ifdef HAVE_HAL_1 + AddItem( p_sd, p_input, psz_device ); +#else + AddItem( p_sd, p_input ); +#endif + vlc_gc_decref( p_input ); +} - playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY, p_sys->p_node, - PLAYLIST_APPEND, PLAYLIST_END ); +#ifdef HAVE_HAL_1 +static void DelItem( services_discovery_t *p_sd, const char* psz_udi ) +{ + services_discovery_sys_t *p_sys = p_sd->p_sys; - vlc_object_release( p_playlist ); + 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 ); + 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] ); + } + } } +#endif -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; - 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 ); @@ -241,37 +279,22 @@ static void AddCdda( services_discovery_t *p_sd, char *psz_device ) 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_item = playlist_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 ); + 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 ); - + 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; @@ -291,11 +314,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 +337,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 +359,35 @@ 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 ) +{ + VLC_UNUSED(p_ctx); + ParseDevice( p_sd_global, psz_udi ); +} +void DeviceRemoved( LibHalContext *p_ctx, const char *psz_udi ) +{ + VLC_UNUSED(p_ctx); + DelItem( p_sd_global, psz_udi ); +} +#endif +