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

SongSticker: use Song references

Browse Source
This commit is contained in:
Max Kellermann
2014-01-08 00:41:08 +01:00
parent c152a88ff6
commit 6a953394f4
4 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/StickerCommands.cxx
View File

@@ -63,7 +63,7 @@ handle_sticker_song(Client &client, int argc, char *argv[])
if (song == nullptr)
return print_error(client, error);
const auto value = sticker_song_get_value(song, argv[4]);
const auto value = sticker_song_get_value(*song, argv[4]);
db->ReturnSong(song);
if (value.empty()) {
command_error(client, ACK_ERROR_NO_EXIST,
@@ -80,7 +80,7 @@ handle_sticker_song(Client &client, int argc, char *argv[])
if (song == nullptr)
return print_error(client, error);
sticker *sticker = sticker_song_get(song);
sticker *sticker = sticker_song_get(*song);
db->ReturnSong(song);
if (sticker) {
sticker_print(client, *sticker);
@@ -94,7 +94,7 @@ handle_sticker_song(Client &client, int argc, char *argv[])
if (song == nullptr)
return print_error(client, error);
bool ret = sticker_song_set_value(song, argv[4], argv[5]);
bool ret = sticker_song_set_value(*song, argv[4], argv[5]);
db->ReturnSong(song);
if (!ret) {
command_error(client, ACK_ERROR_SYSTEM,
@@ -111,8 +111,8 @@ handle_sticker_song(Client &client, int argc, char *argv[])
return print_error(client, error);
bool ret = argc == 4
? sticker_song_delete(song)
: sticker_song_delete_value(song, argv[4]);
? sticker_song_delete(*song)
: sticker_song_delete_value(*song, argv[4]);
db->ReturnSong(song);
if (!ret) {
command_error(client, ACK_ERROR_SYSTEM,