Commit b77716ee authored by Erwan Tulou's avatar Erwan Tulou
Browse files

mediadirs: better detection for recorded material

especially, also detect material recorded at the stream filter level
parent 3fade3ab
......@@ -259,8 +259,9 @@ static int onNewFileAdded( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
services_discovery_t *p_sd = p_data;
services_discovery_sys_t *p_sys = p_sd->p_sys;
(void)p_this; (void)psz_var; (void)oldval;
(void)psz_var; (void)oldval;
char* psz_file = newval.psz_string;
if( !psz_file || !*psz_file )
return VLC_EGENERIC;
......@@ -268,24 +269,34 @@ static int onNewFileAdded( vlc_object_t *p_this, char const *psz_var,
char* psz_uri = make_URI( psz_file );
input_item_t* p_item = input_item_New( p_sd, psz_uri, NULL );
if( fileType( p_sd, psz_file ) == Picture )
if( p_sys->i_type == Picture )
{
formatSnapshotItem( p_item );
services_discovery_AddItem( p_sd, p_item, NULL );
if( fileType( p_sd, psz_file ) == Picture )
{
formatSnapshotItem( p_item );
services_discovery_AddItem( p_sd, p_item, NULL );
msg_Dbg( p_sd, "New snapshot added : %s", psz_file );
msg_Dbg( p_sd, "New snapshot added : %s", psz_file );
}
}
else if( fileType( p_sd, psz_file ) == Audio )
else if( p_sys->i_type == Audio )
{
services_discovery_AddItem( p_sd, p_item, NULL );
if( fileType( p_sd, psz_file ) == Audio )
{
services_discovery_AddItem( p_sd, p_item, NULL );
msg_Dbg( p_sd, "New recorded audio added : %s", psz_file );
msg_Dbg( p_sd, "New recorded audio added : %s", psz_file );
}
}
else if( fileType( p_sd, psz_file ) == Video )
else if( p_sys->i_type == Video )
{
services_discovery_AddItem( p_sd, p_item, NULL );
if( fileType( p_sd, psz_file ) == Video ||
fileType( p_sd, psz_file ) == Unknown )
{
services_discovery_AddItem( p_sd, p_item, NULL );
msg_Dbg( p_sd, "New recorded video added : %s", psz_file );
msg_Dbg( p_sd, "New recorded video added : %s", psz_file );
}
}
vlc_gc_decref( p_item );
......
......@@ -695,12 +695,12 @@ int vlc_accept (int lfd, struct sockaddr *addr, socklen_t *alen, bool nonblock)
if (fd != -1)
{
#ifndef WIN32
fcntl (fd, F_SETFD, FD_CLOEXEC);
if (nonblock)
fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
fcntl (fd, F_SETFD, FD_CLOEXEC);
if (nonblock)
fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
#else
if (nonblock)
ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
if (nonblock)
ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
#endif
return fd;
}
......
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