author | llornkcor <llornkcor> | 2002-05-12 11:55:48 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-12 11:55:48 (UTC) |
commit | b0be5b91c09e3a85de1042c973f17ba3d6897084 (patch) (unidiff) | |
tree | c495d1041295d1487feb40db211781ffc3852e75 | |
parent | 6f19bc4691ec2c0ebbe36fc1aff09e879564fe7d (diff) | |
download | opie-b0be5b91c09e3a85de1042c973f17ba3d6897084.zip opie-b0be5b91c09e3a85de1042c973f17ba3d6897084.tar.gz opie-b0be5b91c09e3a85de1042c973f17ba3d6897084.tar.bz2 |
don't show blank entries in tags
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 7 |
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 @@ | |||
27 | #include <fcntl.h> | 27 | #include <fcntl.h> |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #include <string.h> | 29 | #include <string.h> |
30 | #include <ctype.h> | 30 | #include <ctype.h> |
31 | #include <errno.h> | 31 | #include <errno.h> |
32 | #include <time.h> | 32 | #include <time.h> |
33 | #include <locale.h> | 33 | #include <locale.h> |
34 | #include <math.h> | 34 | #include <math.h> |
35 | #include <assert.h> | 35 | #include <assert.h> |
36 | 36 | ||
37 | #include <qapplication.h> | 37 | #include <qapplication.h> |
38 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
39 | #include <qregexp.h> | ||
40 | 39 | ||
41 | #include <qpe/config.h> | 40 | #include <qpe/config.h> |
42 | 41 | ||
43 | // for network handling | 42 | // for network handling |
44 | #include <netinet/in.h> | 43 | #include <netinet/in.h> |
45 | #include <netdb.h> | 44 | #include <netdb.h> |
46 | #include <sys/socket.h> | 45 | #include <sys/socket.h> |
47 | #include <arpa/inet.h> | 46 | #include <arpa/inet.h> |
48 | #include <unistd.h> | 47 | #include <unistd.h> |
49 | 48 | ||
50 | 49 | ||
51 | //#define HAVE_MMAP | 50 | //#define HAVE_MMAP |
@@ -812,27 +811,29 @@ void LibMadPlugin::printID3Tags() { | |||
812 | } else { | 811 | } else { |
813 | int len[5] = { 30, 30, 30, 4, 30 }; | 812 | int len[5] = { 30, 30, 30, 4, 30 }; |
814 | QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) }; | 813 | QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) }; |
815 | char *ptr = id3v1 + 3, *ptr2 = ptr + len[0]; | 814 | char *ptr = id3v1 + 3, *ptr2 = ptr + len[0]; |
816 | qDebug( "ID3 tags in file:" ); | 815 | qDebug( "ID3 tags in file:" ); |
817 | info = ""; | 816 | info = ""; |
818 | for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) { | 817 | for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) { |
819 | char push = *ptr2; | 818 | char push = *ptr2; |
820 | *ptr2 = '\0'; | 819 | *ptr2 = '\0'; |
821 | char *ptr3 = ptr2; | 820 | char *ptr3 = ptr2; |
822 | while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--; | 821 | while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--; |
823 | char push2 = *ptr3; *ptr3 = '\0'; | 822 | char push2 = *ptr3; *ptr3 = '\0'; |
824 | if ( strcmp( ptr, "" ) ) | 823 | if ( strcmp( ptr, "" ) ) { |
824 | if( ((QString)ptr).find(" ") == -1) // don't add anything that has blanks | ||
825 | info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr; | 825 | info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr; |
826 | //qDebug( info.latin1() ); | 826 | } |
827 | // qDebug( info.latin1() ); | ||
827 | *ptr3 = push2; | 828 | *ptr3 = push2; |
828 | *ptr2 = push; | 829 | *ptr2 = push; |
829 | } | 830 | } |
830 | if (id3v1[126] == 0 && id3v1[127] != 0) | 831 | if (id3v1[126] == 0 && id3v1[127] != 0) |
831 | info += tr( ", Track: " ) + id3v1[127]; | 832 | info += tr( ", Track: " ) + id3v1[127]; |
832 | } | 833 | } |
833 | 834 | ||
834 | if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) { | 835 | if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) { |
835 | qDebug( "error seeking back to beginning" ); | 836 | qDebug( "error seeking back to beginning" ); |
836 | return; | 837 | return; |
837 | } | 838 | } |
838 | } | 839 | } |