*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Includes
*****************************************************************************/
+#define _GNU_SOURCE
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
#include <avahi-client/client.h>
+#ifdef HAVE_AVAHI_06
+# include <avahi-client/publish.h>
+# include <avahi-client/lookup.h>
+#endif
#include <avahi-common/simple-watch.h>
#include <avahi-common/malloc.h>
#include <avahi-common/error.h>
struct services_discovery_sys_t
{
/* playlist node */
- playlist_item_t *p_node;
+ playlist_item_t *p_node_cat, *p_node_one;
playlist_t *p_playlist;
AvahiSimplePoll *simple_poll;
services_discovery_t *p_sd = ( services_discovery_t* )userdata;
services_discovery_sys_t *p_sys = p_sd->p_sys;
+#ifdef HAVE_AVAHI_06
+ if( state == AVAHI_CLIENT_FAILURE &&
+ (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) )
+#else
if( state == AVAHI_CLIENT_DISCONNECTED )
+#endif
{
msg_Err( p_sd, "avahi client disconnected" );
avahi_simple_poll_quit( p_sys->simple_poll );
const AvahiAddress *address,
uint16_t port,
AvahiStringList *txt,
+#ifdef HAVE_AVAHI_06
+ AvahiLookupResultFlags flags,
+#endif
void* userdata )
{
services_discovery_t *p_sd = ( services_discovery_t* )userdata;
services_discovery_sys_t *p_sys = p_sd->p_sys;
+#ifdef HAVE_AVAHI_06
+ if( event == AVAHI_RESOLVER_FAILURE )
+#else
if( event == AVAHI_RESOLVER_TIMEOUT )
+#endif
{
msg_Err( p_sd,
"failed to resolve service '%s' of type '%s' in domain '%s'",
{
char a[128];
char *psz_uri = NULL;
- AvahiStringList *asl;
- playlist_item_t *p_item = NULL;
+ char *psz_addr = NULL;
+ AvahiStringList *asl = NULL;
+ input_item_t *p_input = NULL;
msg_Dbg( p_sd, "service '%s' of type '%s' in domain '%s'",
name, type, domain );
avahi_address_snprint(a, (sizeof(a)/sizeof(a[0]))-1, address);
+ if( protocol == AVAHI_PROTO_INET6 )
+ asprintf( &psz_addr, "[%s]", a );
- asl = avahi_string_list_find( txt, "path" );
+ if( txt != NULL )
+ asl = avahi_string_list_find( txt, "path" );
if( asl != NULL )
{
size_t size;
char *key = NULL;
char *value = NULL;
- if( avahi_string_list_get_pair( asl, &key, &value, &size ) == 0 )
- asprintf( &psz_uri, "http://%s:%d%s", a, port, value );
+ if( avahi_string_list_get_pair( asl, &key, &value, &size ) == 0 &&
+ value != NULL )
+ {
+ asprintf( &psz_uri, "http://%s:%d%s",
+ psz_addr != NULL ? psz_addr : a, port, value );
+ }
+ if( key != NULL )
+ avahi_free( (void *)key );
+ if( value != NULL )
+ avahi_free( (void *)value );
}
else
{
- asprintf( &psz_uri, "http://%s:%d", a, port );
+ asprintf( &psz_uri, "http://%s:%d",
+ psz_addr != NULL ? psz_addr : a, port );
}
+ if( psz_addr != NULL )
+ free( (void *)psz_addr );
+
if( psz_uri != NULL )
- p_item = playlist_ItemNew( p_sd, psz_uri, name );
- if( p_item != NULL )
{
- p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-
- playlist_NodeAddItem( p_sys->p_playlist, p_item,
- VIEW_CATEGORY, p_sys->p_node,
- PLAYLIST_APPEND, PLAYLIST_END );
+ p_input = input_ItemNewExt( p_sd, psz_uri, name, 0, NULL, -1 );
+ free( (void *)psz_uri );
}
+ if( p_input != NULL )
+ {
+ playlist_item_t *p_item;
+ p_item = playlist_NodeAddInput( p_sys->p_playlist, p_input,
+ p_sys->p_node_cat,
+ PLAYLIST_APPEND, PLAYLIST_END );
+ p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
+ p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
+ p_item = playlist_NodeAddInput( p_sys->p_playlist, p_input,
+ p_sys->p_node_one,
+ PLAYLIST_APPEND, PLAYLIST_END );
+ p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
+ p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
+ }
}
avahi_service_resolver_free( r );
const char *name,
const char *type,
const char *domain,
+#ifdef HAVE_AVAHI_06
+ AvahiLookupResultFlags flags,
+#endif
void* userdata )
{
services_discovery_t *p_sd = ( services_discovery_t* )userdata;
{
if( avahi_service_resolver_new( p_sys->client, interface, protocol,
name, type, domain, AVAHI_PROTO_UNSPEC,
+#ifdef HAVE_AVAHI_06
+ 0,
+#endif
resolve_callback, userdata ) == NULL )
{
msg_Err( p_sd, "failed to resolve service '%s': %s", name,
}
else
{
+ /** \todo Store the input id and search it, rather than searching the items */
playlist_item_t *p_item;
-
- p_item = playlist_ChildSearchName( p_sys->p_node, name );
+ p_item = playlist_ChildSearchName( p_sys->p_node_cat, name );
if( p_item == NULL )
- {
msg_Err( p_sd, "failed to find service '%s' in playlist", name );
- }
else
{
- playlist_Delete( p_sys->p_playlist, p_item->input.i_id );
+ playlist_DeleteFromInput( p_sys->p_playlist, p_item->p_input->i_id,
+ VLC_FALSE );
}
}
}
{
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
services_discovery_sys_t *p_sys;
- playlist_view_t *p_view;
- vlc_value_t val;
int err;
p_sd->p_sys = p_sys = (services_discovery_sys_t *)malloc(
}
p_sys->client = avahi_client_new( avahi_simple_poll_get(p_sys->simple_poll),
+#ifdef HAVE_AVAHI_06
+ 0,
+#endif
client_callback, p_sd, &err );
if( p_sys->client == NULL )
{
p_sys->sb = avahi_service_browser_new( p_sys->client, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC,
"_vlc-http._tcp", NULL,
+#ifdef HAVE_AVAHI_06
+ 0,
+#endif
browse_callback, p_sd );
if( p_sys->sb == NULL )
{
goto error;
}
- p_view = playlist_ViewFind( p_sys->p_playlist, VIEW_CATEGORY );
- p_sys->p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
- _("Bonjour"), p_view->p_root );
+ p_sys->p_node_cat = playlist_NodeCreate( p_sys->p_playlist, _("Bonjour"),
+ p_sys->p_playlist->p_root_category, 0 );
+ p_sys->p_node_one = playlist_NodeCreate( p_sys->p_playlist, _("Bonjour"),
+ p_sys->p_playlist->p_root_onelevel, 0 );
+ p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id;
- p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
- val.b_bool = VLC_TRUE;
- var_Set( p_sys->p_playlist, "intf-change", val );
+ p_sys->p_node_one->i_flags |= PLAYLIST_RO_FLAG;
+ p_sys->p_node_cat->i_flags |= PLAYLIST_RO_FLAG;
+ p_sys->p_node_one->i_flags |= PLAYLIST_SKIP_FLAG;
+ p_sys->p_node_cat->i_flags |= PLAYLIST_SKIP_FLAG;
p_sd->pf_run = Run;
avahi_client_free( p_sys->client );
avahi_simple_poll_free( p_sys->simple_poll );
- playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
+ playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node_one, 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 );
projects / vlc / blobdiff