diff options
Diffstat (limited to 'src/modules/mediaplayer/mp_mp3.cpp')
| -rw-r--r-- | src/modules/mediaplayer/mp_mp3.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 8000a9a4..f25a2d26 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -43,6 +43,8 @@ #include <tqfileinfo.h> #include <tqtextcodec.h> +#include <tuple> + #define MAXGENRE 147 #define GENREROWS 50 @@ -396,9 +398,7 @@ int get_id3(mp3info *mp3) { retcode |= 4; } else { - // silence warning about ignoring return value of fread - [[maybe_unused]] size_t _unused = 0; - _unused = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; + std::ignore = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; mp3->id3.genre[0]=255; if(!strcmp((const char *)"TAG",(const char *)fbuf)) @@ -406,16 +406,16 @@ int get_id3(mp3info *mp3) mp3->id3_isvalid=1; mp3->datasize -= 128; fseek(mp3->file, -125, SEEK_END); - _unused = fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; - _unused = fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; - _unused = fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; - _unused = fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; - _unused = fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; + std::ignore = fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; + std::ignore = fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; + std::ignore = fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; + std::ignore = fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; + std::ignore = fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; if(mp3->id3.comment[28] == '\0') { mp3->id3.track[0] = mp3->id3.comment[29]; } - _unused = fread(mp3->id3.genre,1,1,mp3->file); + std::ignore = fread(mp3->id3.genre,1,1,mp3->file); unpad(mp3->id3.title); unpad(mp3->id3.artist); unpad(mp3->id3.album); |