{
/* playlist node */
playlist_item_t *p_node;
+ playlist_item_t *p_node_cat;
playlist_t *p_playlist;
};
services_discovery_sys_t *p_sys = (services_discovery_sys_t *)
malloc( sizeof( services_discovery_sys_t ) );
- playlist_view_t *p_view;
- vlc_value_t val;
-
p_sd->pf_run = Run;
p_sd->p_sys = p_sys;
return VLC_EGENERIC;
}
- p_view = playlist_ViewFind( p_sys->p_playlist, VIEW_CATEGORY );
- p_sys->p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
- "UPnP", p_view->p_root );
- p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
- p_sys->p_node->i_flags &= ~PLAYLIST_SKIP_FLAG;
- val.b_bool = VLC_TRUE;
- var_Set( p_sys->p_playlist, "intf-change", val );
-
+ playlist_NodesPairCreate( p_sys->p_playlist, _("Devices"),
+ &p_sys->p_node_cat, &p_sys->p_node,
+ VLC_TRUE );
return VLC_SUCCESS;
}
{
playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node, VLC_TRUE,
VLC_TRUE );
+ playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node_cat, VLC_TRUE,
+ VLC_TRUE );
vlc_object_release( p_sys->p_playlist );
}
*/
char *str = strdup( dev->getFriendlyName( ) );
- p_item = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
- str, p_sys->p_node );
+ p_item = playlist_NodeCreate( p_sys->p_playlist, str, p_sys->p_node );
p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
msg_Dbg( p_sd, "device %s added", str );
free( str );
playlist_item_t *p_item;
p_item = playlist_ItemNew( p_sd, iNode->getResource(), title );
- playlist_NodeAddItem( p_sys->p_playlist, p_item, VIEW_CATEGORY,
+ playlist_NodeAddItem( p_sys->p_playlist, p_item,
p_parent, PLAYLIST_APPEND, PLAYLIST_END );
} else if ( node->isContainerNode() )
ContainerNode *conNode = (ContainerNode *)node;
char* p_name = strdup(title); /* See other comment on strdup */
- playlist_item_t* p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
+ playlist_item_t* p_node = playlist_NodeCreate( p_sys->p_playlist,
p_name, p_parent );
free(p_name);
if( p_sys->p_playlist )
{
- playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node, VLC_TRUE,
- VLC_TRUE );
- vlc_object_release( p_sys->p_playlist );
+ playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node, VLC_TRUE,
+ VLC_TRUE );
+ playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node_cat, VLC_TRUE,
+ VLC_TRUE );
+ vlc_object_release( p_sys->p_playlist );
}
free( p_sys );
}
break;
+ case UPNP_EVENT_SUBSCRIBE_COMPLETE:
+ msg_Warn( cookie->serviceDiscovery, "subscription complete" );
+ break;
+
+ case UPNP_DISCOVERY_SEARCH_TIMEOUT:
+ msg_Warn( cookie->serviceDiscovery, "search timeout" );
+ break;
+
default:
msg_Dbg( cookie->serviceDiscovery, "%s:%d: DEBUG: UNHANDLED EVENT ( TYPE=%d )", __FILE__, __LINE__, eventType );
break;