X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_discoverer.c;h=23e06c3beb4bbfde5c22fa8f9b3bbf882b2030ca;hb=b01e357d015d7fb8957f96568b371574d6790054;hp=4615d5f51fdb0f99f0f70c26fde5d614d3b94132;hpb=7276a43dcdcdefc7ac9464cb1fb8272c7cab061a;p=vlc diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c index 4615d5f51f..23e06c3beb 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 @@ -57,7 +80,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event, { libvlc_media_t * p_catmd; p_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat, NULL ); - p_mlist = libvlc_media_subitems( p_catmd, NULL ); + p_mlist = libvlc_media_subitems( p_catmd ); p_mlist->b_read_only = true; /* Insert the newly created mlist in our dictionary */ @@ -65,7 +88,7 @@ static void services_discovery_item_added( const vlc_event_t * p_event, /* 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, NULL ); + _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 @@ -73,12 +96,12 @@ static void services_discovery_item_added( const vlc_event_t * p_event, libvlc_media_release( p_catmd ); } } - else - { - libvlc_media_list_lock( p_mlist ); - _libvlc_media_list_add_media( p_mlist, p_md, NULL ); - libvlc_media_list_unlock( 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 ); } /************************************************************************** @@ -92,7 +115,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event, 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++ ) { @@ -155,31 +178,37 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst, p_mdis = malloc(sizeof(libvlc_media_discoverer_t)); if( !p_mdis ) { - libvlc_exception_raise( p_e, "Not enough memory" ); + libvlc_exception_raise( p_e ); + 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 = 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 ); + libvlc_MediaDiscovererEnded ); p_mdis->p_sd = vlc_sd_Create( (vlc_object_t*)p_inst->p_libvlc_int ); if( !p_mdis->p_sd ) { libvlc_media_list_release( p_mdis->p_mlist ); - libvlc_exception_raise( p_e, "Can't find the services_discovery module named '%s'", psz_name ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "%s: no such discovery module found", psz_name ); free( p_mdis ); return NULL; } @@ -205,7 +234,8 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst, if( !vlc_sd_Start( p_mdis->p_sd, psz_name ) ) { libvlc_media_list_release( p_mdis->p_mlist ); - libvlc_exception_raise( p_e, "Can't start the services_discovery module named '%s'", psz_name ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "%s: internal module error", psz_name ); free( p_mdis ); return NULL; } @@ -221,7 +251,25 @@ 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 ); + vlc_sd_StopAndDestroy( p_mdis->p_sd ); /* Free catname_to_submedialist and all the mlist */