len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

metadata: mp4: Fill disc/track count

Browse source 
Show Track Info now shows Discnum/Tracknum as "i/n" (e.g., "1/3" for disc 1 of 3). Previously, it only showed the disc/track number without the total count.

Change-Id: If6b2a73ad0fecc27aaee371f8c860031eacca796
This commit is contained in:
Roman Artiukhin 2025-06-23 18:53:16 +03:00
parent 534460611f
commit c53e9ba27d
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/rbcodec/metadata/mp4.c
View file

@ -367,6 +367,28 @@ static bool read_mp4_esds(int fd, struct mp3entry* id3, uint32_t* size)
return sbr;
}
static void read_mp4_tag_i_from_n(int fd, int *i, char** i_from_n_string, uint32_t size, unsigned int *buffer_left, char **buffer)
{
uint16_t x[3];
*i = 0;
*i_from_n_string = NULL;
if (read_mp4_tag(fd, size, (char*) &x, sizeof(x)) == sizeof(x))
{
*i = betoh16(x[1]);
int n = betoh16(x[2]);
if (n > 0)
{
int string_length = snprintf(*buffer, *buffer_left, "%d/%d", *i, n) + 1;
if (string_length <= *buffer_left)
{
*i_from_n_string = *buffer;
*buffer += string_length;
*buffer_left -= string_length;
}
}
}
}
static bool read_mp4_tags(int fd, struct mp3entry* id3,
uint32_t size_left)
{
@ -456,21 +478,11 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
break;
case MP4_disk:
{
unsigned short n[2];
id3->discnum = 0;
if (read_mp4_tag(fd, size, (char*) &n, sizeof(n)) == sizeof(n))
id3->discnum = betoh16(n[1]);
}
read_mp4_tag_i_from_n(fd, &id3->discnum, &id3->disc_string, size, &buffer_left, &buffer);
break;
case MP4_trkn:
{
unsigned short n[2];
id3->tracknum = 0;
if (read_mp4_tag(fd, size, (char*) &n, sizeof(n)) == sizeof(n))
id3->tracknum = betoh16(n[1]);
}
read_mp4_tag_i_from_n(fd, &id3->tracknum, &id3->track_string, size, &buffer_left, &buffer);
break;
#ifdef HAVE_ALBUMART