*
* Authors: RĂ©mi Denis-Courmont <rem # videolan.org>
*
- * Based on original wxWindows patch for VLC, and dependant on CyberLink
+ * Based on original wxWindows patch for VLC, and dependent on CyberLink
* UPnP library from :
* Satoshi Konno <skonno@cybergarage.org>
*
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_playlist.h>
/* FIXME: thread-safety ?? */
vlc_module_begin();
set_shortname( "UPnP");
- set_description( _("Universal Plug'n'Play discovery") );
+ set_description( N_("Universal Plug'n'Play discovery") );
set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD );
msg_Dbg( p_sd, "UPnP discovery started" );
/* read SAP packets */
- while( !p_sd->b_die )
+ while( vlc_object_alive (p_sd) )
{
msleep( 500 );
}
/* FIXME: playlist_AddInput() can fail */
playlist_BothAddInput( p_playlist, p_input, p_parent,
PLAYLIST_APPEND, PLAYLIST_END, NULL, NULL,
- VLC_FALSE );
+ false );
+ vlc_gc_decref( p_input );
} else if ( node->isContainerNode() )
{
ContainerNode *conNode = (ContainerNode *)node;
playlist_item_t *p_item = FindDeviceNode( dev );
if( p_item != NULL )
- playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_TRUE );
+ playlist_NodeDelete( p_playlist, p_item, true, true );
}