Commit 859a5aa3 authored by Bastien Nocera's avatar Bastien Nocera

plparser: Make save implementation accept GCancellable

parent e8f44a7e
...@@ -84,6 +84,7 @@ totem_pl_parser_save_m3u (TotemPlParser *parser, ...@@ -84,6 +84,7 @@ totem_pl_parser_save_m3u (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
gboolean dos_compatible, gboolean dos_compatible,
GCancellable *cancellable,
GError **error) GError **error)
{ {
TotemPlPlaylistIter iter; TotemPlPlaylistIter iter;
......
...@@ -40,6 +40,7 @@ gboolean totem_pl_parser_save_m3u (TotemPlParser *parser, ...@@ -40,6 +40,7 @@ gboolean totem_pl_parser_save_m3u (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
gboolean dos_compatible, gboolean dos_compatible,
GCancellable *cancellable,
GError **error); GError **error);
TotemPlParserResult totem_pl_parser_add_ram (TotemPlParser *parser, TotemPlParserResult totem_pl_parser_add_ram (TotemPlParser *parser,
......
...@@ -48,6 +48,7 @@ totem_pl_parser_save_pla (TotemPlParser *parser, ...@@ -48,6 +48,7 @@ totem_pl_parser_save_pla (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
const char *title, const char *title,
GCancellable *cancellable,
GError **error) GError **error)
{ {
TotemPlPlaylistIter iter; TotemPlPlaylistIter iter;
......
...@@ -37,6 +37,7 @@ gboolean totem_pl_parser_save_pla (TotemPlParser *parser, ...@@ -37,6 +37,7 @@ gboolean totem_pl_parser_save_pla (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
const char *title, const char *title,
GCancellable *cancellable,
GError **error); GError **error);
TotemPlParserResult totem_pl_parser_add_pla (TotemPlParser *parser, TotemPlParserResult totem_pl_parser_add_pla (TotemPlParser *parser,
......
...@@ -40,6 +40,7 @@ totem_pl_parser_save_pls (TotemPlParser *parser, ...@@ -40,6 +40,7 @@ totem_pl_parser_save_pls (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
const gchar *title, const gchar *title,
GCancellable *cancellable,
GError **error) GError **error)
{ {
TotemPlPlaylistIter iter; TotemPlPlaylistIter iter;
......
...@@ -36,6 +36,7 @@ gboolean totem_pl_parser_save_pls (TotemPlParser *parser, ...@@ -36,6 +36,7 @@ gboolean totem_pl_parser_save_pls (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *file, GFile *file,
const char *title, const char *title,
GCancellable *cancellable,
GError **error); GError **error);
TotemPlParserResult totem_pl_parser_add_pls_with_contents (TotemPlParser *parser, TotemPlParserResult totem_pl_parser_add_pls_with_contents (TotemPlParser *parser,
GFile *file, GFile *file,
......
...@@ -100,6 +100,7 @@ totem_pl_parser_save_xspf (TotemPlParser *parser, ...@@ -100,6 +100,7 @@ totem_pl_parser_save_xspf (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
const char *title, const char *title,
GCancellable *cancellable,
GError **error) GError **error)
{ {
TotemPlPlaylistIter iter; TotemPlPlaylistIter iter;
......
...@@ -37,6 +37,7 @@ gboolean totem_pl_parser_save_xspf (TotemPlParser *parser, ...@@ -37,6 +37,7 @@ gboolean totem_pl_parser_save_xspf (TotemPlParser *parser,
TotemPlPlaylist *playlist, TotemPlPlaylist *playlist,
GFile *output, GFile *output,
const char *title, const char *title,
GCancellable *cancellable,
GError **error); GError **error);
TotemPlParserResult totem_pl_parser_add_xspf_with_contents (TotemPlParser *parser, TotemPlParserResult totem_pl_parser_add_xspf_with_contents (TotemPlParser *parser,
......
...@@ -1152,16 +1152,17 @@ totem_pl_parser_save (TotemPlParser *parser, ...@@ -1152,16 +1152,17 @@ totem_pl_parser_save (TotemPlParser *parser,
switch (type) switch (type)
{ {
case TOTEM_PL_PARSER_PLS: case TOTEM_PL_PARSER_PLS:
return totem_pl_parser_save_pls (parser, playlist, dest, title, error); return totem_pl_parser_save_pls (parser, playlist, dest, title, NULL, error);
case TOTEM_PL_PARSER_M3U: case TOTEM_PL_PARSER_M3U:
case TOTEM_PL_PARSER_M3U_DOS: case TOTEM_PL_PARSER_M3U_DOS:
return totem_pl_parser_save_m3u (parser, playlist, dest, return totem_pl_parser_save_m3u (parser, playlist, dest,
(type == TOTEM_PL_PARSER_M3U_DOS), (type == TOTEM_PL_PARSER_M3U_DOS),
NULL,
error); error);
case TOTEM_PL_PARSER_XSPF: case TOTEM_PL_PARSER_XSPF:
return totem_pl_parser_save_xspf (parser, playlist, dest, title, error); return totem_pl_parser_save_xspf (parser, playlist, dest, title, NULL, error);
case TOTEM_PL_PARSER_IRIVER_PLA: case TOTEM_PL_PARSER_IRIVER_PLA:
return totem_pl_parser_save_pla (parser, playlist, dest, title, error); return totem_pl_parser_save_pla (parser, playlist, dest, title, NULL, error);
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
......
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