Commit 88a0b150 authored by Fabio Ritrovato's avatar Fabio Ritrovato

MTP: update to libmtp 1.0.0 + fixes

parent 2974955f
...@@ -4237,7 +4237,7 @@ PKG_ENABLE_MODULES_VLC([UDEV], [], [libudev >= 142], [Linux udev services discov ...@@ -4237,7 +4237,7 @@ PKG_ENABLE_MODULES_VLC([UDEV], [], [libudev >= 142], [Linux udev services discov
dnl dnl
dnl MTP devices services discovery dnl MTP devices services discovery
PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto]) PKG_ENABLE_MODULES_VLC([MTP], [mtp access_mtp], [libmtp >= 1.0.0], [MTP devices support], [auto])
dnl dnl
dnl Lirc plugin dnl Lirc plugin
......
...@@ -147,6 +147,8 @@ static void *Run( void *data ) ...@@ -147,6 +147,8 @@ static void *Run( void *data )
msg_Dbg( p_sd, "New device found" ); msg_Dbg( p_sd, "New device found" );
if( AddDevice( p_sd, &p_rawdevices[0] ) == VLC_SUCCESS ) if( AddDevice( p_sd, &p_rawdevices[0] ) == VLC_SUCCESS )
i_status = 1; i_status = 1;
else
i_status = 2;
} }
else else
{ {
...@@ -161,7 +163,13 @@ static void *Run( void *data ) ...@@ -161,7 +163,13 @@ static void *Run( void *data )
} }
free( p_rawdevices ); free( p_rawdevices );
vlc_restorecancel(canc); vlc_restorecancel(canc);
msleep( 500000 ); if( i_status == 2 )
{
msleep( 5000000 );
i_status = 0;
}
else
msleep( 500000 );
} }
return NULL; return NULL;
} }
...@@ -216,7 +224,7 @@ static int AddDevice( services_discovery_t *p_sd, ...@@ -216,7 +224,7 @@ static int AddDevice( services_discovery_t *p_sd,
} }
else else
{ {
msg_Warn( p_sd, "No device found, after all" ); msg_Info( p_sd, "The device seems to be mounted, unmount it first" );
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