summaryrefslogtreecommitdiffstats
path: root/src/modules/mediaplayer/mp_mp3.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2026-02-21 11:03:45 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2026-02-22 20:26:55 +0900
commit16d42ec4616a84b046cd71f805a009b792a93ec9 (patch)
tree1522d1dd06ecd32e6c61d142b88d4b4814b83950 /src/modules/mediaplayer/mp_mp3.cpp
parenta09cecfffd5151adfc50e343c821ed8ebdd1ab87 (diff)
downloadkvirc-16d42ec4616a84b046cd71f805a009b792a93ec9.tar.gz
kvirc-16d42ec4616a84b046cd71f805a009b792a93ec9.zip
Fix conversion of TQString to const char* (modules)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/modules/mediaplayer/mp_mp3.cpp')
-rw-r--r--src/modules/mediaplayer/mp_mp3.cpp18
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);