X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_discoverer.c;h=77965ab68dc635701b01bf89ddb29dc13272116e;hb=786292c3f205f96b467321c9973a2ba13029fb60;hp=b861bd20604076bec2653444004f401b9b74ce2d;hpb=dfdb6edd68fe81101c813fe3c1564700ceb9557f;p=vlc diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c index b861bd2060..77965ab68d 100644 --- a/src/control/media_discoverer.c +++ b/src/control/media_discoverer.c @@ -21,10 +21,33 @@ * 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_services_discovery.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 @@ -39,41 +62,45 @@ static void services_discovery_item_added( const vlc_event_t * p_event, { input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item; const char * psz_cat = p_event->u.services_discovery_item_added.psz_category; - libvlc_media_descriptor_t * p_md; + 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 ); /* 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_descriptor_t * p_catmd; - p_catmd = libvlc_media_descriptor_new_as_node( p_mdis->p_libvlc_instance, psz_cat, NULL ); - p_mlist = libvlc_media_descriptor_subitems( p_catmd, NULL ); - p_mlist->b_read_only = VLC_TRUE; + 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_add_media_descriptor( p_mdis->p_mlist, p_catmd, NULL ); + 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_descriptor_release( p_catmd ); + libvlc_media_release( p_catmd ); } } - libvlc_media_list_lock( p_mdis->p_mlist ); - _libvlc_media_list_add_media_descriptor( p_mlist, p_md, NULL ); - libvlc_media_list_unlock( p_mdis->p_mlist ); + 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 ); } /************************************************************************** @@ -84,17 +111,17 @@ static void services_discovery_item_removed( 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; + libvlc_media_t * p_md; libvlc_media_discoverer_t * p_mdis = user_data; - int i, count = libvlc_media_list_count( p_mdis->p_mlist, NULL ); + 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, NULL ); + 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, NULL ); + _libvlc_media_list_remove_index( p_mdis->p_mlist, i ); break; } } @@ -108,10 +135,10 @@ static void services_discovery_item_removed( const vlc_event_t * p_event, static void services_discovery_started( const vlc_event_t * p_event, void * user_data ) { - (void)p_event; + VLC_UNUSED(p_event); libvlc_media_discoverer_t * p_mdis = user_data; libvlc_event_t event; - p_mdis->running = VLC_TRUE; + p_mdis->running = true; event.type = libvlc_MediaDiscovererStarted; libvlc_event_send( p_mdis->p_event_manager, &event ); } @@ -123,10 +150,10 @@ static void services_discovery_started( const vlc_event_t * p_event, static void services_discovery_ended( const vlc_event_t * p_event, void * user_data ) { - (void)p_event; + VLC_UNUSED(p_event); libvlc_media_discoverer_t * p_mdis = user_data; libvlc_event_t event; - p_mdis->running = VLC_FALSE; + p_mdis->running = false; event.type = libvlc_MediaDiscovererEnded; libvlc_event_send( p_mdis->p_event_manager, &event ); } @@ -142,39 +169,44 @@ static void services_discovery_ended( 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_mlist->b_read_only = VLC_TRUE; - p_mdis->running = VLC_FALSE; + p_mdis->p_mlist = libvlc_media_list_new( p_inst ); + p_mdis->p_mlist->b_read_only = true; + p_mdis->running = false; vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 ); - p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis, - p_inst, NULL ); + 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, NULL ); + libvlc_MediaDiscovererStarted ); libvlc_event_manager_register_event_type( p_mdis->p_event_manager, - libvlc_MediaDiscovererEnded, NULL ); - - p_mdis->p_sd = services_discovery_Create( (vlc_object_t*)p_inst->p_libvlc_int, psz_name ); + libvlc_MediaDiscovererEnded ); - if( !p_mdis->p_sd ) + 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 ); - libvlc_exception_raise( p_e, "Can't find the services_discovery module named '%s'", psz_name ); return NULL; } @@ -194,10 +226,17 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst, vlc_ServicesDiscoveryEnded, services_discovery_ended, p_mdis ); - - services_discovery_Start( p_mdis->p_sd ); /* Here we go */ + if( !vlc_sd_Start( p_mdis->p_sd ) ) + { + libvlc_printerr( "%s: internal module error", + 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; } @@ -210,8 +249,26 @@ 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 ); @@ -223,7 +280,8 @@ libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis ) } free( all_keys ); - vlc_dictionary_clear( &p_mdis->catname_to_submedialist ); + vlc_dictionary_clear( &p_mdis->catname_to_submedialist, NULL, NULL ); + libvlc_event_manager_release( p_mdis->p_event_manager ); free( p_mdis ); } @@ -260,9 +318,8 @@ libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis ) /************************************************************************** * running (Public) **************************************************************************/ -vlc_bool_t +int libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis ) { return p_mdis->running; } -