* hal.c : HAL interface module
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
- * Copyright (C) 2006 Rafaël Carré
+ * Copyright © 2006-2007 Rafaël Carré
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_playlist.h>
#include <vlc_network.h>
/*****************************************************************************
* 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;
+ char *psz_udi;
+ input_item_t *p_item;
};
-#endif
struct services_discovery_sys_t
{
+ vlc_thread_t thread;
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 );
-
+static void *Run ( void * );
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 devices detection") );
- set_category( CAT_PLAYLIST );
- set_subcategory( SUBCAT_PLAYLIST_SD );
+vlc_module_begin ()
+ set_description( N_("HAL devices detection") )
+ set_category( CAT_PLAYLIST )
+ set_subcategory( SUBCAT_PLAYLIST_SD )
- set_capability( "services_discovery", 0 );
- set_callbacks( Open, Close );
+ set_capability( "services_discovery", 0 )
+ set_callbacks( Open, Close )
-vlc_module_end();
+vlc_module_end ()
/*****************************************************************************
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;
-
-#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 );
p_sys->p_ctx = libhal_ctx_new();
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;
+ goto error;
}
-#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 );
- 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");
- return VLC_EGENERIC;
+ msg_Err( p_sd, "unable to add callback" );
+ goto error;
}
- playlist_NodesPairCreate( p_playlist, _("Devices"),
- &p_sys->p_node_cat, &p_sys->p_node_one,
- VLC_TRUE );
- vlc_object_release( p_playlist );
+ if( vlc_clone( &p_sys->thread, Run, p_this, VLC_THREAD_PRIORITY_LOW ) )
+ goto error;
return VLC_SUCCESS;
+error:
+ dbus_error_free( &dbus_error );
+ free( p_sys );
+ return VLC_EGENERIC;
}
/*****************************************************************************
{
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 )
- {
- 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 );
+ /*vlc_cancel( p_sys->thread );*/
+ vlc_object_kill( p_sd );
+ vlc_join( p_sys->thread, NULL );
+ 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 );
+ 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 );
+ free( p_udi_entry );
}
p_sys->pp_devices = NULL;
-#endif
+
+ free( p_sys );
}
-static void AddItem( services_discovery_t *p_sd, input_item_t * p_input
-#ifdef HAVE_HAL_1
- ,char* psz_device
-#endif
- )
+static void AddItem( services_discovery_t *p_sd, input_item_t * p_input,
+ const char* psz_device )
{
- 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 );
- 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 );
- p_item_one->i_flags &= ~PLAYLIST_SKIP_FLAG;
-
- vlc_object_release( p_playlist );
+ 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;
+ p_udi_entry->psz_udi = strdup( psz_device );
+ if( !p_udi_entry->psz_udi )
{
+ free( p_udi_entry );
return;
}
- p_udi_entry->i_id = p_item_cat->i_id;
- p_udi_entry->psz_udi = strdup( psz_device );
+
+ 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 );
-#endif
}
-static void AddDvd( services_discovery_t *p_sd, char *psz_device )
+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 );
+ p_input = input_item_New( p_sd, psz_uri, psz_name );
free( psz_uri );
if( !p_input )
{
return;
}
-#ifdef HAVE_HAL_1
+
AddItem( p_sd, p_input, psz_device );
-#else
- AddItem( p_sd, p_input );
-#endif
+
+ vlc_gc_decref( p_input );
}
-#ifdef HAVE_HAL_1
-static void DelItem( services_discovery_t *p_sd, char* psz_udi )
+static void DelItem( services_discovery_t *p_sd, const 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;
- }
+ 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 */
- 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 );
+ { /* 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] );
}
}
-
- vlc_object_release( p_playlist );
}
-#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_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, "Audio CD" );
+
+ if( asprintf( &psz_uri, "cdda://%s", psz_blockdevice ) == -1 )
+ return;
+ /* Create the item here */
+ p_input = input_item_New( p_sd, psz_uri, "Audio CD" );
free( psz_uri );
if( !p_input )
return;
-#ifdef HAVE_HAL_1
+
AddItem( p_sd, p_input, psz_device );
-#else
- AddItem( p_sd, p_input );
-#endif
+
+ 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( !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( !strncmp( psz_disc_type, "cd_r", 4 ) )
- {
-#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 );
- }
- }
+ if( libhal_device_get_property_bool( p_sys->p_ctx, psz_device,
+ "volume.disc.has_audio" , NULL ) )
+ AddCdda( p_sd, psz_device );
}
}
/*****************************************************************************
* Run: main HAL thread
*****************************************************************************/
-static void Run( services_discovery_t *p_sd )
+static void *Run( void *data )
{
- int i, i_devices;
+ services_discovery_t *p_sd = data;
+ services_discovery_sys_t *p_sys = p_sd->p_sys;
char **devices;
- services_discovery_sys_t *p_sys = p_sd->p_sys;
+ int i, i_devices;
+ int canc = vlc_savecancel();
/* 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 ] );
-#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 )
+
+ /* FIXME: Totally lame. There are DBus watch functions to do this properly.
+ * -- Courmisch, 28/08/2008 */
+ while( vlc_object_alive (p_sd) )
{
- /* 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) */
+ /* 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
-
+ vlc_restorecancel (canc);
+ return NULL;
}
-#ifdef HAVE_HAL_1
void DeviceAdded( LibHalContext *p_ctx, const char *psz_udi )
{
- ParseDevice( p_sd_global, (char*) psz_udi );
+ VLC_UNUSED(p_ctx);
+ ParseDevice( p_sd_global, psz_udi );
}
+
void DeviceRemoved( LibHalContext *p_ctx, const char *psz_udi )
{
- DelItem( p_sd_global, (char*) psz_udi );
+ VLC_UNUSED(p_ctx);
+ DelItem( p_sd_global, psz_udi );
}
-#endif
-
projects / vlc / blobdiff