| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame] | 1 | From 2e8dc2c28c0938dbbb85ebbac2b9a60be9ccd9f3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Max Kellermann <max@musicpd.org> |
| 3 | Date: Wed, 23 Nov 2022 12:25:50 +0100 |
| 4 | Subject: [PATCH] SearchPage: use regular integer to fix -Wenum-constexpr-conversion |
| 5 | |
| 6 | Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/ncmpc/commit/ddd1757907f0376b5843f707bf182b7827ff6591] |
| 7 | --- |
| 8 | src/SearchPage.cxx | 6 +++--- |
| 9 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 10 | |
| 11 | diff --git a/src/SearchPage.cxx b/src/SearchPage.cxx |
| 12 | index 2fa5edbc..3f91c4fe 100644 |
| 13 | --- a/src/SearchPage.cxx |
| 14 | +++ b/src/SearchPage.cxx |
| 15 | @@ -81,7 +81,7 @@ search_get_tag_id(const char *name) |
| 16 | } |
| 17 | |
| 18 | struct SearchMode { |
| 19 | - enum mpd_tag_type table; |
| 20 | + int table; |
| 21 | const char *label; |
| 22 | }; |
| 23 | |
| 24 | @@ -89,8 +89,8 @@ static constexpr SearchMode mode[] = { |
| 25 | { MPD_TAG_TITLE, N_("Title") }, |
| 26 | { MPD_TAG_ARTIST, N_("Artist") }, |
| 27 | { MPD_TAG_ALBUM, N_("Album") }, |
| 28 | - { (enum mpd_tag_type)SEARCH_URI, N_("Filename") }, |
| 29 | - { (enum mpd_tag_type)SEARCH_ARTIST_TITLE, N_("Artist + Title") }, |
| 30 | + { SEARCH_URI, N_("Filename") }, |
| 31 | + { SEARCH_ARTIST_TITLE, N_("Artist + Title") }, |
| 32 | { MPD_TAG_COUNT, nullptr } |
| 33 | }; |
| 34 | |
| 35 | -- |
| 36 | 2.39.0 |
| 37 | |