summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-12-04 22:02:57 +0100
committerAidan MacDonald <amachronic@protonmail.com>2021-12-05 14:17:44 -0500
commitdaa3967071b53bbf1b8941babbb3d8f137c93d21 (patch)
tree0a712d6ee94cdea476ffc183f40c0cd8c7e20f80
parent81da5e64090d86b336bdb319bfbf073943551660 (diff)
downloadrockbox-daa3967071b53bbf1b8941babbb3d8f137c93d21.tar.gz
rockbox-daa3967071b53bbf1b8941babbb3d8f137c93d21.zip
Properties Plugin: Fix track or disc number not appearing
Change-Id: I20e60aefd92a2d9f1a64b6197deb6950144a9781
-rw-r--r--apps/plugins/properties.c37
1 files changed, 31 insertions, 6 deletions
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index 6e706248aa..839e593682 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -149,12 +149,37 @@ static bool file_properties(const char* selected_file)
"%s", id3.genre_string ? id3.genre_string : "");
rb->snprintf(str_comment, sizeof str_comment,
"%s", id3.comment ? id3.comment : "");
- rb->snprintf(str_year, sizeof str_year,
- "%s", id3.year_string ? id3.year_string : "");
- rb->snprintf(str_discnum, sizeof str_discnum,
- "%s", id3.disc_string ? id3.disc_string : "");
- rb->snprintf(str_tracknum, sizeof str_tracknum,
- "%s", id3.track_string ? id3.track_string : "");
+
+ if (id3.year_string)
+ rb->snprintf(str_year, sizeof str_year,
+ "%s", id3.year_string);
+ else if (id3.year)
+ rb->snprintf(str_year, sizeof str_year,
+ "%d", id3.year);
+ else
+ rb->snprintf(str_year, sizeof str_year,
+ "%s", "");
+
+ if (id3.disc_string)
+ rb->snprintf(str_discnum, sizeof str_discnum,
+ "%s", id3.disc_string);
+ else if (id3.discnum)
+ rb->snprintf(str_discnum, sizeof str_discnum,
+ "%d", id3.discnum);
+ else
+ rb->snprintf(str_discnum, sizeof str_discnum,
+ "%s", "");
+
+ if (id3.track_string)
+ rb->snprintf(str_tracknum, sizeof str_tracknum,
+ "%s", id3.track_string);
+ else if(id3.tracknum)
+ rb->snprintf(str_tracknum, sizeof str_tracknum,
+ "%d", id3.tracknum);
+ else
+ rb->snprintf(str_tracknum, sizeof str_tracknum,
+ "%s", "");
+
rb->snprintf(str_bitrate, sizeof str_bitrate,
"%d kbps", id3.bitrate ? : 0);
rb->snprintf(str_frequency, sizeof str_frequency,