fixed compilation, not tested though

parent ca5af2c3
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
struct services_discovery_sys_t struct services_discovery_sys_t
{ {
playlist_item_t *p_node_cat;
playlist_item_t *p_node; playlist_item_t *p_node;
playlist_t *p_playlist; playlist_t *p_playlist;
}; };
...@@ -282,9 +283,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -282,9 +283,6 @@ static int Open( vlc_object_t *p_this )
services_discovery_sys_t *p_sys = ( services_discovery_sys_t * ) services_discovery_sys_t *p_sys = ( services_discovery_sys_t * )
malloc( sizeof( 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->pf_run = Run;
p_sd->p_sys = p_sys; p_sd->p_sys = p_sys;
...@@ -294,17 +292,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -294,17 +292,13 @@ static int Open( vlc_object_t *p_this )
FIND_ANYWHERE ); FIND_ANYWHERE );
if( !p_sys->p_playlist ) if( !p_sys->p_playlist )
{ {
msg_Warn( p_sd, "unable to find playlist, cancelling UPnP listening" ); msg_Warn( p_sd, "unable to find playlist, cancelling UPnP listening" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_view = playlist_ViewFind( p_sys->p_playlist, VIEW_CATEGORY ); playlist_NodesPairCreate( p_sys->p_playlist, _("Devices"),
p_sys->p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY, &p_sys->p_node_cat, &p_sys->p_node,
"UPnP", p_view->p_root ); VLC_TRUE );
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 );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -871,7 +865,6 @@ void MediaServer::_buildPlaylist( Container* parent ) ...@@ -871,7 +865,6 @@ void MediaServer::_buildPlaylist( Container* parent )
char* title = strdup( container->getTitle() ); char* title = strdup( container->getTitle() );
playlist_item_t* node = playlist_NodeCreate( _cookie->serviceDiscovery->p_sys->p_playlist, playlist_item_t* node = playlist_NodeCreate( _cookie->serviceDiscovery->p_sys->p_playlist,
VIEW_CATEGORY,
title, title,
parentNode ); parentNode );
free( title ); free( title );
...@@ -891,7 +884,6 @@ void MediaServer::_buildPlaylist( Container* parent ) ...@@ -891,7 +884,6 @@ void MediaServer::_buildPlaylist( Container* parent )
playlist_NodeAddItem( _cookie->serviceDiscovery->p_sys->p_playlist, playlist_NodeAddItem( _cookie->serviceDiscovery->p_sys->p_playlist,
node, node,
VIEW_CATEGORY,
parentNode, PLAYLIST_APPEND, PLAYLIST_END ); parentNode, PLAYLIST_APPEND, PLAYLIST_END );
item->setPlaylistNode( node ); item->setPlaylistNode( node );
...@@ -934,7 +926,6 @@ bool MediaServerList::addServer( MediaServer* s ) ...@@ -934,7 +926,6 @@ bool MediaServerList::addServer( MediaServer* s )
char* name = strdup( s->getFriendlyName() ); char* name = strdup( s->getFriendlyName() );
playlist_item_t* node = playlist_NodeCreate( _cookie->serviceDiscovery->p_sys->p_playlist, playlist_item_t* node = playlist_NodeCreate( _cookie->serviceDiscovery->p_sys->p_playlist,
VIEW_CATEGORY,
name, name,
_cookie->serviceDiscovery->p_sys->p_node ); _cookie->serviceDiscovery->p_sys->p_node );
free( name ); free( name );
......
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