access_http: use only the provided user agent.

[vlc] / modules / access / alsa.c

diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index adb0bcbae67e5e0dc2a8a89c88eb561a7badd273..54085ad6c2e3c7a1ccc16e7657f158a8b6978983 100644 (file)
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -45,8 +45,6 @@
 #include <vlc_demux.h>
 #include <vlc_input.h>
 
-#include <ctype.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -257,14 +255,14 @@ static int DemuxOpen( vlc_object_t *p_this )
     p_sys->i_next_demux_date = -1;
 
     const char *psz_device = NULL;
-    if( p_demux->psz_path && *p_demux->psz_path )
-        psz_device = p_demux->psz_path;
+    if( p_demux->psz_location && *p_demux->psz_location )
+        psz_device = p_demux->psz_location;
     else
         ListAvailableDevices( p_demux, false );
 
     if( FindMainDevice( p_demux, psz_device ) != VLC_SUCCESS )
     {
-        if( p_demux->psz_path && *p_demux->psz_path )
+        if( p_demux->psz_location && *p_demux->psz_location )
             ListAvailableDevices( p_demux, false );
         DemuxClose( p_this );
         return VLC_EGENERIC;