* that category in a media_list. */
if( psz_cat )
{
- p_mlist = kVLCDictionaryNotFound;
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, NULL );
p_mlist = libvlc_media_subitems( p_catmd, NULL );
- p_mlist->b_read_only = VLC_TRUE;
+ 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, 0 );
-
+ 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, NULL );
libvlc_media_release( p_catmd );
}
}
-
- libvlc_media_list_lock( p_mlist );
- _libvlc_media_list_add_media( p_mlist, p_md, NULL );
- libvlc_media_list_unlock( p_mlist );
+ else
+ {
+ libvlc_media_list_lock( p_mlist );
+ _libvlc_media_list_add_media( p_mlist, p_md, NULL );
+ libvlc_media_list_unlock( p_mlist );
+ }
}
/**************************************************************************
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 );
}
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 );
}
libvlc_exception_t * p_e )
{
libvlc_media_discoverer_t * p_mdis;
-
+
p_mdis = malloc(sizeof(libvlc_media_discoverer_t));
if( !p_mdis )
{
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->b_read_only = true;
+ p_mdis->running = false;
vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 );
{
return p_mdis->running;
}
-