Commit 26d96c35 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

libvlc: remove deprecated SD event manager

parent 9a4e671d
......@@ -178,18 +178,6 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
LIBVLC_DEPRECATED LIBVLC_API char *
libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis );
/**
* Get event manager from media service discover object.
*
* \deprecated Useless, media_discoverer events are only triggered when calling
* libvlc_media_discoverer_start() and libvlc_media_discoverer_stop().
*
* \param p_mdis media service discover object
* \return event manager object.
*/
LIBVLC_DEPRECATED LIBVLC_API libvlc_event_manager_t *
libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis );
/** @}*/
/**
......
......@@ -184,23 +184,12 @@ enum libvlc_event_e {
*/
libvlc_MediaListPlayerStopped,
/**
* \deprecated Useless event, it will be triggered only when calling
* libvlc_media_discoverer_start()
*/
libvlc_MediaDiscovererStarted=0x500,
/**
* \deprecated Useless event, it will be triggered only when calling
* libvlc_media_discoverer_stop()
*/
libvlc_MediaDiscovererEnded,
/**
* A new \link #libvlc_renderer_item_t renderer item\endlink was found by a
* \link #libvlc_renderer_discoverer_t renderer discoverer\endlink.
* The renderer item is valid until deleted.
*/
libvlc_RendererDiscovererItemAdded,
libvlc_RendererDiscovererItemAdded=0x502,
/**
* A previously discovered \link #libvlc_renderer_item_t renderer item\endlink
......
......@@ -189,9 +189,6 @@ static const event_name_t event_list[] = {
DEF(MediaListPlayerNextItemSet)
DEF(MediaListPlayerStopped)
DEF(MediaDiscovererStarted)
DEF(MediaDiscovererEnded)
DEF(VlmMediaAdded)
DEF(VlmMediaRemoved)
DEF(VlmMediaChanged)
......
......@@ -63,7 +63,6 @@ libvlc_log_set_file
libvlc_log_unset
libvlc_media_add_option
libvlc_media_add_option_flag
libvlc_media_discoverer_event_manager
libvlc_media_discoverer_is_running
libvlc_media_discoverer_localized_name
libvlc_media_discoverer_media_list
......
......@@ -41,7 +41,6 @@
struct libvlc_media_discoverer_t
{
libvlc_event_manager_t event_manager;
libvlc_instance_t * p_libvlc_instance;
services_discovery_t * p_sd;
libvlc_media_list_t * p_mlist;
......@@ -164,7 +163,6 @@ libvlc_media_discoverer_new( libvlc_instance_t * p_inst, const char * psz_name )
p_mdis->p_sd = NULL;
vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 );
libvlc_event_manager_init( &p_mdis->event_manager, p_mdis );
libvlc_retain( p_inst );
strcpy( p_mdis->name, psz_name );
......@@ -192,9 +190,6 @@ libvlc_media_discoverer_start( libvlc_media_discoverer_t * p_mdis )
return -1;
}
libvlc_event_t event;
event.type = libvlc_MediaDiscovererStarted;
libvlc_event_send( &p_mdis->event_manager, &event );
return 0;
}
......@@ -209,10 +204,6 @@ libvlc_media_discoverer_stop( libvlc_media_discoverer_t * p_mdis )
libvlc_media_list_internal_end_reached( p_mlist );
libvlc_media_list_unlock( p_mlist );
libvlc_event_t event;
event.type = libvlc_MediaDiscovererEnded;
libvlc_event_send( &p_mdis->event_manager, &event );
vlc_sd_Destroy( p_mdis->p_sd );
p_mdis->p_sd = NULL;
}
......@@ -261,7 +252,6 @@ libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis )
vlc_dictionary_clear( &p_mdis->catname_to_submedialist,
MediaListDictValueRelease, NULL );
libvlc_event_manager_destroy( &p_mdis->event_manager );
libvlc_release( p_mdis->p_libvlc_instance );
free( p_mdis );
......@@ -288,16 +278,6 @@ 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->event_manager;
}
/**************************************************************************
* running (Public)
**************************************************************************/
......
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