DIR *handle;
char *ignored_exts;
int mode;
- int i_item_count;
- char *psz_xspf_extension;
};
static block_t *Block( access_t * );
p_sys->current = NULL;
p_sys->handle = handle;
p_sys->ignored_exts = var_CreateGetString (p_access, "ignore-filetypes");
- p_sys->i_item_count = 0;
- p_sys->psz_xspf_extension = strdup( "" );
/* Handle mode */
char *psz = var_CreateGetString( p_access, "recursive" );
}
if (p_sys->handle != NULL)
closedir (p_sys->handle); /* corner case,:Block() not called ever */
- free (p_sys->psz_xspf_extension);
free (p_sys->ignored_exts);
free (p_sys);
}
{ /* Startup: send the XSPF header */
static const char header[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\" xmlns:vlc=\"http://www.videolan.org/vlc/playlist/ns/0/\">\n"
+ "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n"
" <trackList>\n";
block_t *block = block_Alloc (sizeof (header) - 1);
if (!block)
if (p_sys->current == NULL)
{ /* End of XSPF playlist */
- char *footer;
- int len = asprintf( &footer, " </trackList>\n" \
- " <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" \
- "%s" \
- " </extension>\n" \
- "</playlist>\n", p_sys->psz_xspf_extension );
- if( len < 0 )
- goto fatal;
+ static const char footer[] =
+ " </trackList>\n"
+ "</playlist>\n";
- block_t *block = block_Alloc ( len );
+ block_t *block = block_Alloc (sizeof (footer) - 1);
if (!block)
goto fatal;
- memcpy (block->p_buffer, footer, len);
- free( footer );
+ memcpy (block->p_buffer, footer, sizeof (footer) - 1);
p_access->info.b_eof = true;
return block;
}
- else
- {
- /* This was the end of a "subnode" */
- /* Write the ID to the extension */
- char *old_xspf_extension = p_sys->psz_xspf_extension;
- if (old_xspf_extension == NULL)
- goto fatal;
-
- int len2 = asprintf( &p_sys->psz_xspf_extension, "%s </vlc:node>\n", old_xspf_extension );
- if (len2 == -1)
- goto fatal;
- free( old_xspf_extension );
- }
return NULL;
}
return NULL;
}
p_sys->current = sub;
-
- /* Add node to xspf extension */
- char *old_xspf_extension = p_sys->psz_xspf_extension;
- if (old_xspf_extension == NULL)
- goto fatal;
-
- int len2 = asprintf( &p_sys->psz_xspf_extension, "%s <vlc:node title=\"%s\">\n", old_xspf_extension, entry );
- if (len2 == -1)
- goto fatal;
- free( old_xspf_extension );
-
return NULL;
}
else
if (encoded == NULL)
goto fatal;
int len = asprintf (&entry,
- " <track><location>file://%s/%s</location>\n" \
- " <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" \
- " <vlc:id>%d</vlc:id>\n" \
- " </extension>\n" \
- " </track>\n",
- current->uri, encoded, p_sys->i_item_count++);
+ " <track><location>file://%s/%s</location></track>\n",
+ current->uri, encoded);
free (encoded);
if (len == -1)
goto fatal;
- /* Write the ID to the extension */
- char *old_xspf_extension = p_sys->psz_xspf_extension;
- if (old_xspf_extension == NULL)
- goto fatal;
-
- int len2 = asprintf( &p_sys->psz_xspf_extension, "%s <vlc:item tid=\"%i\" />\n",
- old_xspf_extension, p_sys->i_item_count-1 );
- if (len2 == -1)
- goto fatal;
- free( old_xspf_extension );
-
/* TODO: new block allocator for malloc()ated data */
block_t *block = block_Alloc (len);
if (!block)