Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (7)
......@@ -26,56 +26,29 @@
#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
#include <vlc_common.h>
#include <vlc_list.h>
#include <vlc_plugin.h>
#include <vlc_services_discovery.h>
#include <vlc_vector.h>
#include <libmtp.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Open( vlc_object_t * );
static void Close( vlc_object_t * );
VLC_SD_PROBE_HELPER("mtp", N_("MTP devices"), SD_CAT_DEVICES)
vlc_module_begin()
set_shortname( "MTP" )
set_description( N_( "MTP devices" ) )
set_category( CAT_PLAYLIST )
set_subcategory( SUBCAT_PLAYLIST_SD )
set_capability( "services_discovery", 0 )
set_callbacks( Open, Close )
cannot_unload_broken_library()
VLC_SD_PROBE_SUBMODULE
vlc_module_end()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void *Run( void * );
static int AddDevice( services_discovery_t *, LIBMTP_raw_device_t * );
static void AddTrack( services_discovery_t *, LIBMTP_track_t *);
static void CloseDevice( services_discovery_t * );
static int CountTracks( uint64_t const, uint64_t const, void const * const );
/*****************************************************************************
* Local structures
*****************************************************************************/
typedef struct VLC_VECTOR(input_item_t *) vec_items_t;
typedef struct
{
int i_tracks_num;
input_item_t **pp_items;
int i_count;
struct vlc_list node;
input_item_t *root;
vec_items_t items;
char *psz_name;
uint32_t i_bus;
uint8_t i_dev;
uint16_t i_product_id;
} mtp_device_t;
typedef struct
{
struct vlc_list devices; /**< list of mtp_device_t */
vlc_thread_t thread;
} services_discovery_sys_t;
......@@ -85,98 +58,105 @@ static void vlc_libmtp_init(void *data)
LIBMTP_Init();
}
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
static int Open( vlc_object_t *p_this )
/* Takes ownership of the name */
static mtp_device_t *
DeviceNew( char *name )
{
services_discovery_t *p_sd = ( services_discovery_t * )p_this;
services_discovery_sys_t *p_sys;
mtp_device_t *device = malloc( sizeof( *device ) );
if ( !device )
return NULL;
if( !( p_sys = malloc( sizeof( services_discovery_sys_t ) ) ) )
return VLC_ENOMEM;
p_sd->p_sys = p_sys;
p_sd->description = _("MTP devices");
p_sys->psz_name = NULL;
device->root = input_item_NewExt( "vlc://nop", name,
INPUT_DURATION_INDEFINITE,
ITEM_TYPE_NODE, ITEM_LOCAL );
if ( !device->root )
{
free( device );
return NULL;
}
static vlc_once_t mtp_init_once = VLC_STATIC_ONCE;
device->psz_name = name;
vlc_once(&mtp_init_once, vlc_libmtp_init, NULL);
vlc_vector_init( &device->items );
if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
{
free (p_sys);
return VLC_EGENERIC;
}
return VLC_SUCCESS;
return device;
}
/*****************************************************************************
* Close: cleanup
*****************************************************************************/
static void Close( vlc_object_t *p_this )
static void
DeviceDelete( mtp_device_t *device )
{
services_discovery_t *p_sd = ( services_discovery_t * )p_this;
services_discovery_sys_t *p_sys = p_sd->p_sys;
for (size_t i = 0; i < device->items.size; ++i )
input_item_Release( device->items.data[i] );
vlc_vector_destroy( &device->items );
free( p_sys->psz_name );
vlc_cancel( p_sys->thread );
vlc_join( p_sys->thread, NULL );
free( p_sys );
input_item_Release( device->root );
free( device->psz_name );
free( device );
}
/*****************************************************************************
* Run: main thread
*****************************************************************************/
static void *Run( void *data )
static char *GetDeviceName( LIBMTP_mtpdevice_t *p_device )
{
LIBMTP_raw_device_t *p_rawdevices;
int i_numrawdevices;
int i_ret;
int i_status = 0;
services_discovery_t *p_sd = data;
char *name = LIBMTP_Get_Friendlyname( p_device );
if ( !EMPTY_STR( name ) )
return name;
for(;;)
name = LIBMTP_Get_Modelname( p_device );
if ( !EMPTY_STR( name ) )
return name;
return strdup( "MTP Device" );
}
static void AddTrack( services_discovery_t *p_sd, mtp_device_t *device,
LIBMTP_track_t *p_track )
{
input_item_t *p_input;
char *psz_string;
char *extension;
extension = rindex( p_track->filename, '.' );
if( asprintf( &psz_string, "mtp://%"PRIu32":%"PRIu8":%"PRIu16":%d%s",
device->i_bus, device->i_dev,
device->i_product_id, p_track->item_id,
extension ) == -1 )
{
int canc = vlc_savecancel();
i_ret = LIBMTP_Detect_Raw_Devices( &p_rawdevices, &i_numrawdevices );
if ( i_ret == 0 && i_numrawdevices > 0 && p_rawdevices != NULL &&
i_status == 0 )
{
/* Found a new device, add it */
msg_Dbg( p_sd, "New device found" );
if( AddDevice( p_sd, &p_rawdevices[0] ) == VLC_SUCCESS )
i_status = 1;
else
i_status = 2;
}
else
{
if ( ( i_ret != 0 || i_numrawdevices == 0 || p_rawdevices == NULL )
&& i_status == 1)
{
/* The device is not connected anymore, delete it */
msg_Info( p_sd, "Device disconnected" );
CloseDevice( p_sd );
i_status = 0;
}
}
free( p_rawdevices );
vlc_restorecancel(canc);
if( i_status == 2 )
{
vlc_tick_sleep( VLC_TICK_FROM_SEC(5) );
i_status = 0;
}
else
vlc_tick_sleep( VLC_TICK_FROM_MS(500) );
msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
return;
}
return NULL;
if( ( p_input = input_item_New( psz_string, p_track->title ) ) == NULL )
{
msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
free( psz_string );
return;
}
free( psz_string );
input_item_SetArtist( p_input, p_track->artist );
input_item_SetGenre( p_input, p_track->genre );
input_item_SetAlbum( p_input, p_track->album );
if( asprintf( &psz_string, "%d", p_track->tracknumber ) != -1 )
{
input_item_SetTrackNum( p_input, psz_string );
free( psz_string );
}
if( asprintf( &psz_string, "%d", p_track->rating ) != -1 )
{
input_item_SetRating( p_input, psz_string );
free( psz_string );
}
input_item_SetDate( p_input, p_track->date );
p_input->i_duration = VLC_TICK_FROM_MS(p_track->duration);
if ( !vlc_vector_push( &device->items, p_input ) )
{
msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
input_item_Release( p_input );
return;
}
services_discovery_AddSubItem( p_sd, device->root, p_input );
}
/*****************************************************************************
* Everything else
*****************************************************************************/
static int AddDevice( services_discovery_t *p_sd,
LIBMTP_raw_device_t *p_raw_device )
{
......@@ -187,41 +167,46 @@ static int AddDevice( services_discovery_t *p_sd,
if( ( p_device = LIBMTP_Open_Raw_Device( p_raw_device ) ) != NULL )
{
if( !( psz_name = LIBMTP_Get_Friendlyname( p_device ) ) )
if( !( psz_name = LIBMTP_Get_Modelname( p_device ) ) )
if( !( psz_name = strdup( N_( "MTP Device" ) ) ) )
return VLC_ENOMEM;
psz_name = GetDeviceName( p_device );
if ( !psz_name )
return VLC_ENOMEM;
msg_Info( p_sd, "Found device: %s", psz_name );
p_sys->i_bus = p_raw_device->bus_location;
p_sys->i_dev = p_raw_device->devnum;
p_sys->i_product_id = p_raw_device->device_entry.product_id;
/* The device takes ownership of the name */
mtp_device_t *mtp_device = DeviceNew( psz_name );
if ( !mtp_device )
{
free( psz_name );
return VLC_ENOMEM;
}
mtp_device->i_bus = p_raw_device->bus_location;
mtp_device->i_dev = p_raw_device->devnum;
mtp_device->i_product_id = p_raw_device->device_entry.product_id;
vlc_list_append( &mtp_device->node, &p_sys->devices );
services_discovery_AddItem( p_sd, mtp_device->root );
if( ( p_track = LIBMTP_Get_Tracklisting_With_Callback( p_device,
CountTracks, p_sd ) ) == NULL )
NULL, NULL ) ) == NULL )
{
msg_Warn( p_sd, "No tracks on the device" );
p_sys->pp_items = NULL;
}
else
{
if( !( p_sys->pp_items = calloc( p_sys->i_tracks_num,
sizeof( input_item_t * ) ) ) )
{
free( psz_name );
return VLC_ENOMEM;
}
p_sys->i_count = 0;
while( p_track != NULL )
{
msg_Dbg( p_sd, "Track found: %s - %s", p_track->artist,
p_track->title );
AddTrack( p_sd, p_track );
AddTrack( p_sd, mtp_device, p_track );
p_tmp = p_track;
p_track = p_track->next;
LIBMTP_destroy_track_t( p_tmp );
}
}
p_sys->psz_name = psz_name;
LIBMTP_Release_Device( p_device );
return VLC_SUCCESS;
}
else
......@@ -231,74 +216,151 @@ static int AddDevice( services_discovery_t *p_sd,
}
}
static void AddTrack( services_discovery_t *p_sd, LIBMTP_track_t *p_track )
static void CloseDevice( services_discovery_t *p_sd, mtp_device_t *device )
{
/* Notify the removal of the whole node and its children */
services_discovery_RemoveItem( p_sd, device->root );
vlc_list_remove( &device->node );
DeviceDelete( device );
}
static int
FindRawDevice( const LIBMTP_raw_device_t *raw_devices, int count,
uint32_t bus_location, uint8_t devnum )
{
for ( int i = 0; i < count; ++i )
if ( raw_devices[i].bus_location == bus_location &&
raw_devices[i].devnum == devnum )
return i;
return -1;
}
static mtp_device_t *
FindDevice( struct vlc_list *devices, uint32_t bus_location, uint8_t devnum )
{
mtp_device_t *device;
vlc_list_foreach( device, devices, node )
if ( device->i_bus == bus_location &&
device->i_dev == devnum )
return device;
return NULL;
}
static void
UpdateDevices( services_discovery_t *p_sd,
LIBMTP_raw_device_t *raw_devices, int count )
{
services_discovery_sys_t *p_sys = p_sd->p_sys;
input_item_t *p_input;
char *psz_string;
char *extension;
extension = rindex( p_track->filename, '.' );
if( asprintf( &psz_string, "mtp://%"PRIu32":%"PRIu8":%"PRIu16":%d%s",
p_sys->i_bus, p_sys->i_dev,
p_sys->i_product_id, p_track->item_id,
extension ) == -1 )
{
msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
return;
}
if( ( p_input = input_item_New( psz_string, p_track->title ) ) == NULL )
{
msg_Err( p_sd, "Error adding %s, skipping it", p_track->filename );
free( psz_string );
return;
}
free( psz_string );
/* Remove devices which have disappeared */
input_item_SetArtist( p_input, p_track->artist );
input_item_SetGenre( p_input, p_track->genre );
input_item_SetAlbum( p_input, p_track->album );
if( asprintf( &psz_string, "%d", p_track->tracknumber ) != -1 )
mtp_device_t *device;
vlc_list_foreach( device, &p_sys->devices, node )
{
input_item_SetTrackNum( p_input, psz_string );
free( psz_string );
int idx = FindRawDevice( raw_devices, count, device->i_bus,
device->i_dev );
if ( idx == -1 )
{
/* Not found */
msg_Info( p_sd, "Device disconnected" );
CloseDevice( p_sd, device );
}
}
if( asprintf( &psz_string, "%d", p_track->rating ) != -1 )
/* Add new detected devices */
for ( int i = 0; i < count; ++i )
{
input_item_SetRating( p_input, psz_string );
free( psz_string );
LIBMTP_raw_device_t *raw_device = &raw_devices[i];
device = FindDevice( &p_sys->devices, raw_device->bus_location,
raw_device->devnum );
if ( !device )
{
/* Device not found in the list, it's a new one */
msg_Dbg( p_sd, "New device detected" );
if ( AddDevice( p_sd, raw_device ) != VLC_SUCCESS )
msg_Err( p_sd, "Could not add MTP device" );
}
}
input_item_SetDate( p_input, p_track->date );
p_input->i_duration = VLC_TICK_FROM_MS(p_track->duration);
services_discovery_AddItem( p_sd, p_input );
p_sys->pp_items[p_sys->i_count++] = p_input;
}
static void CloseDevice( services_discovery_t *p_sd )
/*****************************************************************************
* Run: main thread
*****************************************************************************/
static void *Run( void *data )
{
services_discovery_sys_t *p_sys = p_sd->p_sys;
input_item_t **pp_items = p_sys->pp_items;
LIBMTP_raw_device_t *p_rawdevices;
int i_numrawdevices;
services_discovery_t *p_sd = data;
if( pp_items != NULL )
for(;;)
{
for( int i_i = 0; i_i < p_sys->i_count; i_i++ )
int canc = vlc_savecancel();
int ret = LIBMTP_Detect_Raw_Devices( &p_rawdevices, &i_numrawdevices );
if ( ret == LIBMTP_ERROR_NONE ||
ret == LIBMTP_ERROR_NO_DEVICE_ATTACHED )
{
if( pp_items[i_i] != NULL )
{
services_discovery_RemoveItem( p_sd, pp_items[i_i] );
input_item_Release( pp_items[i_i] );
}
UpdateDevices( p_sd, p_rawdevices, i_numrawdevices );
if ( ret == LIBMTP_ERROR_NONE )
free( p_rawdevices );
}
free( pp_items );
vlc_restorecancel(canc);
vlc_tick_sleep( VLC_TICK_FROM_MS(500) );
}
return NULL;
}
static int Open( vlc_object_t *p_this )
{
services_discovery_t *p_sd = ( services_discovery_t * )p_this;
services_discovery_sys_t *p_sys;
if( !( p_sys = malloc( sizeof( services_discovery_sys_t ) ) ) )
return VLC_ENOMEM;
p_sd->p_sys = p_sys;
p_sd->description = _("MTP devices");
vlc_list_init( &p_sys->devices );
static vlc_once_t mtp_init_once = VLC_STATIC_ONCE;
vlc_once(&mtp_init_once, vlc_libmtp_init, NULL);
if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
{
free (p_sys);
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
static int CountTracks( uint64_t const sent, uint64_t const total,
void const * const data )
static void Close( vlc_object_t *p_this )
{
VLC_UNUSED( sent );
services_discovery_t *p_sd = (services_discovery_t *)data;
services_discovery_t *p_sd = ( services_discovery_t * )p_this;
services_discovery_sys_t *p_sys = p_sd->p_sys;
p_sys->i_tracks_num = total;
return 0;
vlc_cancel( p_sys->thread );
vlc_join( p_sys->thread, NULL );
mtp_device_t *device;
vlc_list_foreach( device, &p_sys->devices, node )
DeviceDelete( device );
free( p_sys );
}
VLC_SD_PROBE_HELPER("mtp", N_("MTP devices"), SD_CAT_DEVICES)
vlc_module_begin()
set_shortname( "MTP" )
set_description( N_( "MTP devices" ) )
set_category( CAT_PLAYLIST )
set_subcategory( SUBCAT_PLAYLIST_SD )
set_capability( "services_discovery", 0 )
set_callbacks( Open, Close )
cannot_unload_broken_library()
VLC_SD_PROBE_SUBMODULE
vlc_module_end()