comparison src/tta/aud-tta.c @ 442:052f21493419 trunk

[svn] I committed too fast, there was even more.
author js
date Tue, 16 Jan 2007 12:47:04 -0800
parents 86478f5b0543
children 9e76e87c857e
comparison
equal deleted inserted replaced
441:86478f5b0543 442:052f21493419
904 free(str); 904 free(str);
905 str = NULL; 905 str = NULL;
906 906
907 str = tta_input_id3_get_string (tag, ID3_FRAME_ALBUM); 907 str = tta_input_id3_get_string (tag, ID3_FRAME_ALBUM);
908 if(str){ 908 if(str){
909 strcpy(ttainfo->id3v2.album, str); 909 strncpy(ttainfo->id3v2.album, str, MAX_LINE);
910 strncpy(ttainfo->id3v1.album, str, 30); 910 strncpy(ttainfo->id3v1.album, str, 30);
911 } 911 }
912 free(str); 912 free(str);
913 str = NULL; 913 str = NULL;
914 914
915 str = tta_input_id3_get_string (tag, ID3_FRAME_TITLE); 915 str = tta_input_id3_get_string (tag, ID3_FRAME_TITLE);
916 if(str) { 916 if(str) {
917 strcpy(ttainfo->id3v2.title, str); 917 strncpy(ttainfo->id3v2.title, str, MAX_LINE);
918 strncpy(ttainfo->id3v1.title, str, 30); 918 strncpy(ttainfo->id3v1.title, str, 30);
919 } 919 }
920 free(str); 920 free(str);
921 str = NULL; 921 str = NULL;
922 922
934 str = NULL; 934 str = NULL;
935 935
936 // track number 936 // track number
937 str = tta_input_id3_get_string (tag, ID3_FRAME_TRACK); 937 str = tta_input_id3_get_string (tag, ID3_FRAME_TRACK);
938 if(str) 938 if(str)
939 strcpy(ttainfo->id3v2.track, str); 939 strncpy(ttainfo->id3v2.track, str, MAX_TRACK);
940 free(str); 940 free(str);
941 str = NULL; 941 str = NULL;
942 942
943 // genre 943 // genre
944 str = tta_input_id3_get_string (tag, ID3_FRAME_GENRE); 944 str = tta_input_id3_get_string (tag, ID3_FRAME_GENRE);
945 if(str) { 945 if(str) {
946 id3_ucs4_t *tmp = NULL; 946 id3_ucs4_t *tmp = NULL;
947 strcpy(ttainfo->id3v2.genre, str); 947 strncpy(ttainfo->id3v2.genre, str, MAX_GENRE);
948 tmp = id3_latin1_ucs4duplicate((id3_latin1_t *)str); 948 tmp = id3_latin1_ucs4duplicate((id3_latin1_t *)str);
949 ttainfo->id3v1.genre = id3_genre_number(tmp); 949 ttainfo->id3v1.genre = id3_genre_number(tmp);
950 g_free(tmp); 950 g_free(tmp);
951 } 951 }
952 free(str); 952 free(str);
953 str = NULL; 953 str = NULL;
954 954
955 // comment 955 // comment
956 str = tta_input_id3_get_string (tag, ID3_FRAME_COMMENT); 956 str = tta_input_id3_get_string (tag, ID3_FRAME_COMMENT);
957 if(str) { 957 if(str)
958 strcpy(ttainfo->id3v2.comment, str);
959 strncpy(ttainfo->id3v2.comment, str, 30); 958 strncpy(ttainfo->id3v2.comment, str, 30);
960 }
961 free(str); 959 free(str);
962 str = NULL; 960 str = NULL;
963 961
964 if(*(ttainfo->id3v2.title) && *(ttainfo->id3v2.artist)) { 962 if(*(ttainfo->id3v2.title) && *(ttainfo->id3v2.artist)) {
965 ttainfo->id3v2.id3has = 1; 963 ttainfo->id3v2.id3has = 1;