Skip to content

V
vlc-1.1
Commit ebcd5487 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Don't use D-Bus with hal < 0.5.0

parent 15de00ea
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/services_discovery/hal.c
View file @ ebcd5487
...@@ -81,15 +81,17 @@ static int Open( vlc_object_t *p_this ) ...@@ -81,15 +81,17 @@ static int Open( vlc_object_t *p_this )
playlist_t *p_playlist; playlist_t *p_playlist;
#ifdef HAVE_HAL_1
DBusError dbus_error; DBusError dbus_error;
DBusConnection *p_connection; DBusConnection *p_connection;
#endif
p_sd->pf_run = Run; p_sd->pf_run = Run;
p_sd->p_sys = p_sys; p_sd->p_sys = p_sys;
#ifdef HAVE_HAL_1
dbus_error_init( &dbus_error ); dbus_error_init( &dbus_error );
#ifdef HAVE_HAL_1
p_sys->p_ctx = libhal_ctx_new(); p_sys->p_ctx = libhal_ctx_new();
if( !p_sys->p_ctx ) if( !p_sys->p_ctx )
{ {
...@@ -111,8 +113,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -111,8 +113,12 @@ static int Open( vlc_object_t *p_this )
if( !(p_sys->p_ctx = hal_initialize( NULL, FALSE ) ) ) if( !(p_sys->p_ctx = hal_initialize( NULL, FALSE ) ) )
#endif #endif
{ {
#ifdef HAVE_HAL_1
msg_Err( p_sd, "hal not available : %s", dbus_error.message ); msg_Err( p_sd, "hal not available : %s", dbus_error.message );
dbus_error_free( &dbus_error ); dbus_error_free( &dbus_error );
#else
msg_Err( p_sd, "hal not available" );
#endif
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment