Commit 0565b5c2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove HAL support

HAL is officially deprecated. The new udev discs module provide the same
functionality in VLC. Moreover, the plugin was waking up the CPU at
regular intervals. Last, InitDeviceValues seemed to cause problems with
wrong disc paths being saved to vlcrc for some people
parent da8ac562
...@@ -4577,10 +4577,6 @@ dnl ...@@ -4577,10 +4577,6 @@ dnl
dnl Bonjour services discovery dnl Bonjour services discovery
PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto]) PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto])
dnl
dnl HAL services discovery
PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto])
dnl dnl
dnl libudev services discovery dnl libudev services discovery
PKG_ENABLE_MODULES_VLC([UDEV], [], [libudev >= 142], [Linux udev services discovery], [auto]) PKG_ENABLE_MODULES_VLC([UDEV], [], [libudev >= 142], [Linux udev services discovery], [auto])
......
SOURCES_sap = sap.c SOURCES_sap = sap.c
SOURCES_hal = hal.c
SOURCES_shout = shout.c SOURCES_shout = shout.c
SOURCES_upnp_cc = upnp_cc.cpp SOURCES_upnp_cc = upnp_cc.cpp
SOURCES_upnp_intel = upnp_intel.cpp upnp_intel.hpp SOURCES_upnp_intel = upnp_intel.cpp upnp_intel.hpp
......
This diff is collapsed.
...@@ -75,10 +75,6 @@ ...@@ -75,10 +75,6 @@
# include <dbus/dbus.h> # include <dbus/dbus.h>
#endif #endif
#ifdef HAVE_HAL
# include <hal/libhal.h>
#endif
#include <vlc_playlist.h> #include <vlc_playlist.h>
#include <vlc_interface.h> #include <vlc_interface.h>
...@@ -227,8 +223,6 @@ static void PauseConsole ( void ); ...@@ -227,8 +223,6 @@ static void PauseConsole ( void );
#endif #endif
static int ConsoleWidth ( void ); static int ConsoleWidth ( void );
static void InitDeviceValues( libvlc_int_t * );
static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; static vlc_mutex_t global_lock = VLC_STATIC_MUTEX;
/** /**
...@@ -542,11 +536,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -542,11 +536,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
return i_ret; return i_ret;
} }
/*
* Init device values
*/
InitDeviceValues( p_libvlc );
/* /*
* Override default configuration with config file settings * Override default configuration with config file settings
*/ */
...@@ -2092,73 +2081,6 @@ static int ConsoleWidth( void ) ...@@ -2092,73 +2081,6 @@ static int ConsoleWidth( void )
return i_width; return i_width;
} }
/*****************************************************************************
* InitDeviceValues: initialize device values
*****************************************************************************
* This function inits the dvd, vcd and cd-audio values
*****************************************************************************/
static void InitDeviceValues( libvlc_int_t *p_vlc )
{
#ifdef HAVE_HAL
LibHalContext * ctx = NULL;
int i, i_devices;
char **devices = NULL;
char *block_dev = NULL;
dbus_bool_t b_dvd;
DBusConnection *p_connection = NULL;
DBusError error;
ctx = libhal_ctx_new();
if( !ctx ) return;
dbus_error_init( &error );
p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
if( dbus_error_is_set( &error ) || !p_connection )
{
libhal_ctx_free( ctx );
dbus_error_free( &error );
return;
}
libhal_ctx_set_dbus_connection( ctx, p_connection );
if( libhal_ctx_init( ctx, &error ) )
{
if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) )
{
for( i = 0; i < i_devices; i++ )
{
if( !libhal_device_property_exists( ctx, devices[i],
"storage.cdrom.dvd", NULL ) )
{
continue;
}
b_dvd = libhal_device_get_property_bool( ctx, devices[ i ],
"storage.cdrom.dvd", NULL );
block_dev = libhal_device_get_property_string( ctx,
devices[ i ], "block.device" , NULL );
if( b_dvd )
{
config_PutPsz( p_vlc, "dvd", block_dev );
}
config_PutPsz( p_vlc, "vcd", block_dev );
config_PutPsz( p_vlc, "cd-audio", block_dev );
libhal_free_string( block_dev );
}
libhal_free_string_array( devices );
}
libhal_ctx_shutdown( ctx, NULL );
dbus_connection_unref( p_connection );
libhal_ctx_free( ctx );
}
else
{
msg_Warn( p_vlc, "Unable to get HAL device properties" );
}
#else
(void)p_vlc;
#endif /* HAVE_HAL */
}
#include <vlc_avcodec.h> #include <vlc_avcodec.h>
void vlc_avcodec_mutex (bool acquire) void vlc_avcodec_mutex (bool acquire)
......
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