oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

PlaylistFile: fold spl_move_index() into handle_playlistmove()

Browse Source
This commit is contained in:
Max Kellermann 2021-10-25 12:11:45 +02:00
parent a6173e0eae
commit ade847bc89
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/PlaylistFile.cxx
View File

@ -321,19 +321,6 @@ PlaylistFileEditor::Save()
idle_add(IDLE_STORED_PLAYLIST);
}
void
spl_move_index(const char *utf8path, unsigned src, unsigned dest)
{
if (src == dest)
/* this doesn't check whether the playlist exists, but
what the hell.. */
return;
PlaylistFileEditor editor(utf8path, PlaylistFileEditor::LoadMode::YES);
editor.MoveIndex(src, dest);
editor.Save();
}
void
spl_clear(const char *utf8path)
{
@ -372,14 +359,6 @@ spl_delete(const char *name_utf8)
idle_add(IDLE_STORED_PLAYLIST);
}
void
spl_remove_index(const char *utf8path, unsigned pos)
{
PlaylistFileEditor editor(utf8path, PlaylistFileEditor::LoadMode::YES);
editor.RemoveIndex(pos);
editor.Save();
}
void
spl_append_song(const char *utf8path, const DetachedSong &song)
try {

6
src/PlaylistFile.hxx
View File

@ -89,18 +89,12 @@ spl_map_to_fs(const char *name_utf8);
PlaylistVector
ListPlaylistFiles();
void
spl_move_index(const char *utf8path, unsigned src, unsigned dest);
void
spl_clear(const char *utf8path);
void
spl_delete(const char *name_utf8);
void
spl_remove_index(const char *utf8path, unsigned pos);
void
spl_append_song(const char *utf8path, const DetachedSong &song);

13
src/command/PlaylistCommands.cxx
View File

@ -177,7 +177,9 @@ handle_playlistdelete([[maybe_unused]] Client &client,
const char *const name = args[0];
unsigned from = args.ParseUnsigned(1);
spl_remove_index(name, from);
PlaylistFileEditor editor(name, PlaylistFileEditor::LoadMode::YES);
editor.RemoveIndex(from);
editor.Save();
return CommandResult::OK;
}
@ -189,7 +191,14 @@ handle_playlistmove([[maybe_unused]] Client &client,
unsigned from = args.ParseUnsigned(1);
unsigned to = args.ParseUnsigned(2);
spl_move_index(name, from, to);
if (from == to)
/* this doesn't check whether the playlist exists, but
what the hell.. */
return CommandResult::OK;
PlaylistFileEditor editor(name, PlaylistFileEditor::LoadMode::YES);
editor.MoveIndex(from, to);
editor.Save();
return CommandResult::OK;
}