diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/http/httpfiletransfer.cpp | 8 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mp3.cpp | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index f2cb79dd5..cab8f98b9 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -260,16 +260,16 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect) { KviTimeUtils::secondsToDaysHoursMinsSecs(kvi_timeSpan(m_tTransferEndTime,m_tTransferStartTime),&uD,&uH,&uM,&uS); txt = "TOT: "; - if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD, uH, uM, uS); - else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH, uM, uS); + if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS); + else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS); else txt += QString(__tr2qs_ctx("%3m %4s","http")).arg(uM, uS); } else { if(iEta >= 0) { KviTimeUtils::secondsToDaysHoursMinsSecs(iEta,&uD,&uH,&uM,&uS); txt = "ETA: "; - if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD, uH, uM, uS); - else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH, uM, uS); + if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS); + else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS); else txt += QString(__tr2qs_ctx("%3m %4s","http")).arg(uM, uS); } else { txt = "ETA: Unknown"; diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 8f2f926d4..19ee2e0f2 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -383,14 +383,15 @@ int get_id3(mp3info *mp3) // this will read ID3v1 tags int retcode=0; char fbuf[4]; - + size_t dummy; // make gcc happy + if(mp3->datasize >= 128) { if(fseek(mp3->file, -128, SEEK_END )) { retcode |= 4; } else { - fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; + dummy = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; mp3->id3.genre[0]=255; if(!strcmp((const char *)"TAG",(const char *)fbuf)) @@ -398,16 +399,16 @@ int get_id3(mp3info *mp3) mp3->id3_isvalid=1; mp3->datasize -= 128; fseek(mp3->file, -125, SEEK_END); - fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; - fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; - fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; - fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; - fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; + dummy = fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; + dummy = fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; + dummy = fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; + dummy = fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; + dummy = 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]; } - fread(mp3->id3.genre,1,1,mp3->file); + dummy = fread(mp3->id3.genre,1,1,mp3->file); unpad(mp3->id3.title); unpad(mp3->id3.artist); unpad(mp3->id3.album); |