X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_discoverer.c;h=c4163b3d586f5aaa6bf428d4a47b5f4b1df5b46a;hb=d61a6d40f2330b4896d2a7d6a258c716578700fe;hp=f2f735bb2bda61793a913372298b9dc15335c70c;hpb=7e042a1c43bd226714572c3d534602e1bad9310d;p=vlc diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c index f2f735bb2b..c4163b3d58 100644 --- a/src/control/media_discoverer.c +++ b/src/control/media_discoverer.c @@ -21,15 +21,38 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "libvlc_internal.h" -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include "vlc_playlist.h" + +#include +#include +#include +#include +#include + +#include + +#include "libvlc_internal.h" +#include "media_internal.h" // libvlc_media_new_from_input_item() +#include "media_list_internal.h" // _libvlc_media_list_add_media() + +struct libvlc_media_discoverer_t +{ + libvlc_event_manager_t * p_event_manager; + libvlc_instance_t * p_libvlc_instance; + services_discovery_t * p_sd; + libvlc_media_list_t * p_mlist; + bool running; + vlc_dictionary_t catname_to_submedialist; +}; /* * Private functions */ - + /************************************************************************** * services_discovery_item_added (Private) (VLC event callback) **************************************************************************/ @@ -38,16 +61,46 @@ static void services_discovery_item_added( const vlc_event_t * p_event, void * user_data ) { input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item; - libvlc_media_descriptor_t * p_md; + const char * psz_cat = p_event->u.services_discovery_item_added.psz_category; + libvlc_media_t * p_md; libvlc_media_discoverer_t * p_mdis = user_data; + libvlc_media_list_t * p_mlist = p_mdis->p_mlist; - p_md = libvlc_media_descriptor_new_from_input_item( - p_mdis->p_libvlc_instance, - p_item, NULL ); + p_md = libvlc_media_new_from_input_item( p_mdis->p_libvlc_instance, + p_item ); - libvlc_media_list_lock( p_mdis->p_mlist ); - libvlc_media_list_add_media_descriptor( p_mdis->p_mlist, p_md, NULL ); - libvlc_media_list_unlock( p_mdis->p_mlist ); + /* If we have a category, that mean we have to group the items having + * that category in a media_list. */ + if( psz_cat ) + { + p_mlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, psz_cat ); + + if( p_mlist == kVLCDictionaryNotFound ) + { + libvlc_media_t * p_catmd; + p_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat ); + p_mlist = libvlc_media_subitems( p_catmd ); + p_mlist->b_read_only = true; + + /* Insert the newly created mlist in our dictionary */ + vlc_dictionary_insert( &p_mdis->catname_to_submedialist, psz_cat, p_mlist ); + + /* Insert the md into the root list */ + libvlc_media_list_lock( p_mdis->p_mlist ); + _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd ); + libvlc_media_list_unlock( p_mdis->p_mlist ); + + /* We don't release the mlist cause the dictionary + * doesn't retain the object. But we release the md. */ + libvlc_media_release( p_catmd ); + } + } + + libvlc_media_list_lock( p_mlist ); + _libvlc_media_list_add_media( p_mlist, p_md ); + libvlc_media_list_unlock( p_mlist ); + + libvlc_media_release( p_md ); } /************************************************************************** @@ -57,7 +110,52 @@ static void services_discovery_item_added( const vlc_event_t * p_event, static void services_discovery_item_removed( const vlc_event_t * p_event, void * user_data ) { - /* Not handled */ + input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item; + libvlc_media_t * p_md; + libvlc_media_discoverer_t * p_mdis = user_data; + + int i, count = libvlc_media_list_count( p_mdis->p_mlist ); + libvlc_media_list_lock( p_mdis->p_mlist ); + for( i = 0; i < count; i++ ) + { + p_md = libvlc_media_list_item_at_index( p_mdis->p_mlist, i ); + if( p_md->p_input_item == p_item ) + { + _libvlc_media_list_remove_index( p_mdis->p_mlist, i ); + break; + } + } + libvlc_media_list_unlock( p_mdis->p_mlist ); +} + +/************************************************************************** + * services_discovery_started (Private) (VLC event callback) + **************************************************************************/ + +static void services_discovery_started( const vlc_event_t * p_event, + void * user_data ) +{ + VLC_UNUSED(p_event); + libvlc_media_discoverer_t * p_mdis = user_data; + libvlc_event_t event; + p_mdis->running = true; + event.type = libvlc_MediaDiscovererStarted; + libvlc_event_send( p_mdis->p_event_manager, &event ); +} + +/************************************************************************** + * services_discovery_ended (Private) (VLC event callback) + **************************************************************************/ + +static void services_discovery_ended( const vlc_event_t * p_event, + void * user_data ) +{ + VLC_UNUSED(p_event); + libvlc_media_discoverer_t * p_mdis = user_data; + libvlc_event_t event; + p_mdis->running = false; + event.type = libvlc_MediaDiscovererEnded; + libvlc_event_send( p_mdis->p_event_manager, &event ); } /* @@ -71,28 +169,47 @@ static void services_discovery_item_removed( const vlc_event_t * p_event, **************************************************************************/ libvlc_media_discoverer_t * libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst, - const char * psz_name, - libvlc_exception_t * p_e ) + const char * psz_name ) { libvlc_media_discoverer_t * p_mdis; - + p_mdis = malloc(sizeof(libvlc_media_discoverer_t)); - if( !p_mdis ) + if( unlikely(!p_mdis) ) { - libvlc_exception_raise( p_e, "Not enough memory" ); + libvlc_printerr( "Not enough memory" ); return NULL; } p_mdis->p_libvlc_instance = p_inst; - p_mdis->p_mlist = libvlc_media_list_new( p_inst, NULL ); - p_mdis->p_sd = services_discovery_Create( (vlc_object_t*)p_inst->p_libvlc_int, psz_name ); + p_mdis->p_mlist = libvlc_media_list_new( p_inst ); + p_mdis->p_mlist->b_read_only = true; + p_mdis->running = false; - if( !p_mdis->p_sd ) + vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 ); + + p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis, p_inst ); + if( unlikely(p_mdis->p_event_manager == NULL) ) { free( p_mdis ); return NULL; } + libvlc_event_manager_register_event_type( p_mdis->p_event_manager, + libvlc_MediaDiscovererStarted ); + libvlc_event_manager_register_event_type( p_mdis->p_event_manager, + libvlc_MediaDiscovererEnded ); + + p_mdis->p_sd = vlc_sd_Create( (vlc_object_t*)p_inst->p_libvlc_int, + psz_name ); + if( unlikely(p_mdis->p_sd == NULL) ) + { + libvlc_printerr( "%s: no such discovery module found", psz_name ); + libvlc_media_list_release( p_mdis->p_mlist ); + libvlc_event_manager_release( p_mdis->p_event_manager ); + free( p_mdis ); + return NULL; + } + vlc_event_attach( services_discovery_EventManager( p_mdis->p_sd ), vlc_ServicesDiscoveryItemAdded, services_discovery_item_added, @@ -101,10 +218,25 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst, vlc_ServicesDiscoveryItemRemoved, services_discovery_item_removed, p_mdis ); - - services_discovery_Start( p_mdis->p_sd ); + vlc_event_attach( services_discovery_EventManager( p_mdis->p_sd ), + vlc_ServicesDiscoveryStarted, + services_discovery_started, + p_mdis ); + vlc_event_attach( services_discovery_EventManager( p_mdis->p_sd ), + vlc_ServicesDiscoveryEnded, + services_discovery_ended, + p_mdis ); /* Here we go */ + if( !vlc_sd_Start( p_mdis->p_sd ) ) + { + libvlc_printerr( "%s: internal module error", + p_mdis->p_sd->psz_name ); + libvlc_media_list_release( p_mdis->p_mlist ); + libvlc_event_manager_release( p_mdis->p_event_manager ); + free( p_mdis ); + return NULL; + } return p_mdis; } @@ -115,8 +247,42 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst, void libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis ) { + int i; + + vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ), + vlc_ServicesDiscoveryItemAdded, + services_discovery_item_added, + p_mdis ); + vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ), + vlc_ServicesDiscoveryItemRemoved, + services_discovery_item_removed, + p_mdis ); + vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ), + vlc_ServicesDiscoveryStarted, + services_discovery_started, + p_mdis ); + vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ), + vlc_ServicesDiscoveryEnded, + services_discovery_ended, + p_mdis ); + libvlc_media_list_release( p_mdis->p_mlist ); - services_discovery_Destroy( p_mdis->p_sd ); + + vlc_sd_StopAndDestroy( p_mdis->p_sd ); + + /* Free catname_to_submedialist and all the mlist */ + char ** all_keys = vlc_dictionary_all_keys( &p_mdis->catname_to_submedialist ); + for( i = 0; all_keys[i]; i++ ) + { + libvlc_media_list_t * p_catmlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, all_keys[i] ); + libvlc_media_list_release( p_catmlist ); + free( all_keys[i] ); + } + free( all_keys ); + + vlc_dictionary_clear( &p_mdis->catname_to_submedialist, NULL, NULL ); + libvlc_event_manager_release( p_mdis->p_event_manager ); + free( p_mdis ); } @@ -139,3 +305,21 @@ libvlc_media_discoverer_media_list( libvlc_media_discoverer_t * p_mdis ) return p_mdis->p_mlist; } +/************************************************************************** + * event_manager (Public) + **************************************************************************/ +libvlc_event_manager_t * +libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis ) +{ + return p_mdis->p_event_manager; +} + + +/************************************************************************** + * running (Public) + **************************************************************************/ +int +libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis ) +{ + return p_mdis->running; +}