From f71c204eef0149c25951597f5c4235cbfcac981c Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sat, 28 Jan 2017 16:12:30 +0100 Subject: [PATCH] Correct method types to match Interface.hxx --- src/db/Count.cxx | 8 ++------ src/db/DatabasePlaylist.cxx | 3 +-- src/db/DatabasePrint.cxx | 31 ++++++++----------------------- src/db/DatabaseQueue.cxx | 3 +-- src/db/Helpers.cxx | 4 +--- 5 files changed, 13 insertions(+), 36 deletions(-) diff --git a/src/db/Count.cxx b/src/db/Count.cxx index ddd9e2930..9c3945677 100644 --- a/src/db/Count.cxx +++ b/src/db/Count.cxx @@ -62,7 +62,7 @@ Print(Response &r, TagType group, const TagCountMap &m) } } -static bool +static void stats_visitor_song(SearchStats &stats, const LightSong &song) { stats.n_songs++; @@ -70,8 +70,6 @@ stats_visitor_song(SearchStats &stats, const LightSong &song) const auto duration = song.GetDuration(); if (!duration.IsNegative()) stats.total_duration += duration; - - return true; } static bool @@ -94,7 +92,7 @@ CollectGroupCounts(TagCountMap &map, TagType group, const Tag &tag) return found; } -static bool +static void GroupCountVisitor(TagCountMap &map, TagType group, const LightSong &song) { assert(song.tag != nullptr); @@ -103,8 +101,6 @@ GroupCountVisitor(TagCountMap &map, TagType group, const LightSong &song) if (!CollectGroupCounts(map, group, tag) && group == TAG_ALBUM_ARTIST) /* fall back to "Artist" if no "AlbumArtist" was found */ CollectGroupCounts(map, TAG_ARTIST, tag); - - return true; } void diff --git a/src/db/DatabasePlaylist.cxx b/src/db/DatabasePlaylist.cxx index b19895b96..78bbdd5cd 100644 --- a/src/db/DatabasePlaylist.cxx +++ b/src/db/DatabasePlaylist.cxx @@ -27,13 +27,12 @@ #include -static bool +static void AddSong(const Storage &storage, const char *playlist_path_utf8, const LightSong &song) { spl_append_song(playlist_path_utf8, DatabaseDetachSong(storage, song)); - return true; } void diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx index 8435748fa..87d441d20 100644 --- a/src/db/DatabasePrint.cxx +++ b/src/db/DatabasePrint.cxx @@ -49,16 +49,14 @@ PrintDirectoryURI(Response &r, bool base, const LightDirectory &directory) ApplyBaseFlag(directory.GetPath(), base)); } -static bool +static void PrintDirectoryBrief(Response &r, bool base, const LightDirectory &directory) { if (!directory.IsRoot()) PrintDirectoryURI(r, base, directory); - - return true; } -static bool +static void PrintDirectoryFull(Response &r, bool base, const LightDirectory &directory) { if (!directory.IsRoot()) { @@ -67,8 +65,6 @@ PrintDirectoryFull(Response &r, bool base, const LightDirectory &directory) if (directory.mtime > 0) time_print(r, "Last-Modified", directory.mtime); } - - return true; } static void @@ -96,7 +92,7 @@ print_playlist_in_directory(Response &r, bool base, directory->GetPath(), name_utf8); } -static bool +static void PrintSongBrief(Response &r, Partition &partition, bool base, const LightSong &song) { @@ -106,11 +102,9 @@ PrintSongBrief(Response &r, Partition &partition, /* this song file has an embedded CUE sheet */ print_playlist_in_directory(r, base, song.directory, song.uri); - - return true; } -static bool +static void PrintSongFull(Response &r, Partition &partition, bool base, const LightSong &song) { @@ -120,21 +114,18 @@ PrintSongFull(Response &r, Partition &partition, /* this song file has an embedded CUE sheet */ print_playlist_in_directory(r, base, song.directory, song.uri); - - return true; } -static bool +static void PrintPlaylistBrief(Response &r, bool base, const PlaylistInfo &playlist, const LightDirectory &directory) { print_playlist_in_directory(r, base, &directory, playlist.name.c_str()); - return true; } -static bool +static void PrintPlaylistFull(Response &r, bool base, const PlaylistInfo &playlist, const LightDirectory &directory) @@ -144,8 +135,6 @@ PrintPlaylistFull(Response &r, bool base, if (playlist.mtime > 0) time_print(r, "Last-Modified", playlist.mtime); - - return true; } void @@ -191,15 +180,13 @@ db_selection_print(Response &r, Partition &partition, 0, std::numeric_limits::max()); } -static bool +static void PrintSongURIVisitor(Response &r, Partition &partition, const LightSong &song) { song_print_uri(r, partition, song); - - return true; } -static bool +static void PrintUniqueTag(Response &r, TagType tag_type, const Tag &tag) { @@ -211,8 +198,6 @@ PrintUniqueTag(Response &r, TagType tag_type, if (item.type != tag_type) r.Format("%s: %s\n", tag_item_names[item.type], item.value); - - return true; } void diff --git a/src/db/DatabaseQueue.cxx b/src/db/DatabaseQueue.cxx index 2c4fffa4d..1b9adcfdc 100644 --- a/src/db/DatabaseQueue.cxx +++ b/src/db/DatabaseQueue.cxx @@ -27,14 +27,13 @@ #include -static bool +static void AddToQueue(Partition &partition, const LightSong &song) { const Storage &storage = *partition.instance.storage; partition.playlist.AppendSong(partition.pc, DatabaseDetachSong(storage, song)); - return true; } void diff --git a/src/db/Helpers.cxx b/src/db/Helpers.cxx index 5ed6d43d3..bff14a3bb 100644 --- a/src/db/Helpers.cxx +++ b/src/db/Helpers.cxx @@ -67,15 +67,13 @@ StatsVisitTag(DatabaseStats &stats, StringSet &artists, StringSet &albums, } } -static bool +static void StatsVisitSong(DatabaseStats &stats, StringSet &artists, StringSet &albums, const LightSong &song) { ++stats.song_count; StatsVisitTag(stats, artists, albums, *song.tag); - - return true; } DatabaseStats