summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-12 11:55:48 (UTC)
committer llornkcor <llornkcor>2002-05-12 11:55:48 (UTC)
commitb0be5b91c09e3a85de1042c973f17ba3d6897084 (patch) (side-by-side diff)
treec495d1041295d1487feb40db211781ffc3852e75
parent6f19bc4691ec2c0ebbe36fc1aff09e879564fe7d (diff)
downloadopie-b0be5b91c09e3a85de1042c973f17ba3d6897084.zip
opie-b0be5b91c09e3a85de1042c973f17ba3d6897084.tar.gz
opie-b0be5b91c09e3a85de1042c973f17ba3d6897084.tar.bz2
don't show blank entries in tags
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index b06cdaa..0adb503 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -27,25 +27,24 @@
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <time.h>
#include <locale.h>
#include <math.h>
#include <assert.h>
#include <qapplication.h>
#include <qmessagebox.h>
-#include <qregexp.h>
#include <qpe/config.h>
// for network handling
#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <unistd.h>
//#define HAVE_MMAP
@@ -812,27 +811,29 @@ void LibMadPlugin::printID3Tags() {
} else {
int len[5] = { 30, 30, 30, 4, 30 };
QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) };
char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
qDebug( "ID3 tags in file:" );
info = "";
for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) {
char push = *ptr2;
*ptr2 = '\0';
char *ptr3 = ptr2;
while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--;
char push2 = *ptr3; *ptr3 = '\0';
- if ( strcmp( ptr, "" ) )
+ if ( strcmp( ptr, "" ) ) {
+ if( ((QString)ptr).find(" ") == -1) // don't add anything that has blanks
info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr;
- //qDebug( info.latin1() );
+ }
+// qDebug( info.latin1() );
*ptr3 = push2;
*ptr2 = push;
}
if (id3v1[126] == 0 && id3v1[127] != 0)
info += tr( ", Track: " ) + id3v1[127];
}
if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) {
qDebug( "error seeking back to beginning" );
return;
}
}