Commits

shuerhaaken committed b250245

clean up code 2

Comments (0)

Files changed (17)

bindings/c/taginfo_c.cc

     return i->get_has_image();
 }
 
-char * taginfo_info_get_disk_str(const TagInfo_Info *info) {
+char * taginfo_info_get_disk_string(const TagInfo_Info *info) {
     const Info *i = reinterpret_cast<const Info *>(info);
     char *s = ::strdup(i->get_disk_string().toCString(true));
     if(stringManagementEnabled)
         strings.prepend(s);
     return s;
 }
-void taginfo_info_set_disk_str(TagInfo_Info *info, const char *disk_str) {
+void taginfo_info_set_disk_string(TagInfo_Info *info, const char *disk_string) {
     Info *i = reinterpret_cast<Info *>(info);
-    i->set_disk_string(String(disk_str, String::UTF8));
+    i->set_disk_string(String(disk_string, String::UTF8));
 }
 
 BOOL taginfo_info_get_is_compilation(const TagInfo_Info *info) {

bindings/c/taginfo_c.h

 int taginfo_info_get_samplerate(const TagInfo_Info *info);
 int taginfo_info_get_channels(const TagInfo_Info *info);
 
-char *taginfo_info_get_disk_str(const TagInfo_Info *info);
-void  taginfo_info_set_disk_str(TagInfo_Info *info, const char *disk_str);
+char *taginfo_info_get_disk_string(const TagInfo_Info *info);
+void  taginfo_info_set_disk_string(TagInfo_Info *info, const char *disk_string);
 
 BOOL taginfo_info_get_is_compilation(const TagInfo_Info *info);
 void taginfo_info_set_is_compilation(TagInfo_Info *info, BOOL is_compilation);

bindings/vala/libtaginfo_c.vapi

 			set;
 		}
 		public string disk_string {
-			[CCode (cname = "taginfo_info_get_disk_str")]
+			[CCode (cname = "taginfo_info_get_disk_string")]
 			owned get;
-			[CCode (cname = "taginfo_info_set_disk_str")]
+			[CCode (cname = "taginfo_info_set_disk_string")]
 			set;
 		}
 		public int length {

libtaginfo/apeinfo.cc

 #include "taginfo_internal.h"
 
 #define APE_TAG_DISKNO              "DISCNUMBER"
-#define APE_TAG_COMILATION          "COMPILATION"
+#define APE_TAG_COMPILATION         "COMPILATION"
 #define APE_TAG_ALBUMARTIST         "ALBUM ARTIST" 
 #define APE_TAG_TRACK               "Track"
 #define APE_TAG_COMPOSER            "COMPOSER" 
                 composer = taglib_apetag->itemListMap()[APE_TAG_COMPOSER].toStringList().front();
             }
             if(taglib_apetag->itemListMap().contains(APE_TAG_DISKNO)) {
-                disk_str = taglib_apetag->itemListMap()[APE_TAG_DISKNO].toStringList().front();
+                disk_string = taglib_apetag->itemListMap()[APE_TAG_DISKNO].toStringList().front();
             }
-            if(taglib_apetag->itemListMap().contains(APE_TAG_COMILATION)) {
+            if(taglib_apetag->itemListMap().contains(APE_TAG_COMPILATION)) {
                 is_compilation = 
-                    taglib_apetag->itemListMap()[APE_TAG_COMILATION].toStringList().front() == String("1");
+                    taglib_apetag->itemListMap()[APE_TAG_COMPILATION].toStringList().front() == String("1");
             }
             if(taglib_apetag->itemListMap().contains(APE_TAG_ALBUMARTIST)) {
                 album_artist = taglib_apetag->itemListMap()[APE_TAG_ALBUMARTIST].toStringList().front();
             // Labels
             if(track_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("TRACK_LABELS")) {
-                    track_labels_str = taglib_apetag->itemListMap()["TRACK_LABELS"].toStringList().front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = taglib_apetag->itemListMap()["TRACK_LABELS"].toStringList().front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("ARTIST_LABELS")) {
-                    artist_labels_str = taglib_apetag->itemListMap()["ARTIST_LABELS"].toStringList().front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = taglib_apetag->itemListMap()["ARTIST_LABELS"].toStringList().front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("ALBUM_LABELS")) {
-                    album_labels_str = taglib_apetag->itemListMap()["ALBUM_LABELS"].toStringList().front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = taglib_apetag->itemListMap()["ALBUM_LABELS"].toStringList().front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             if(taglib_apetag->itemListMap().contains(APE_TAG_COVER_ART_FRONT)) {
             if(changedflag & CHANGED_COMPOSER_TAG)
                 taglib_apetag->addValue(APE_TAG_COMPOSER, composer);
             if(changedflag & CHANGED_DISK_STR)
-                taglib_apetag->addValue(APE_TAG_DISKNO, disk_str);
+                taglib_apetag->addValue(APE_TAG_DISKNO, disk_string);
             
             if(changedflag & CHANGED_IS_COMPILATION_TAG) {
                 if(is_compilation) {
-                    taglib_apetag->addValue(APE_TAG_COMILATION, "1");
+                    taglib_apetag->addValue(APE_TAG_COMPILATION, "1");
                 }
                 else {
-                    taglib_apetag->addValue(APE_TAG_COMILATION, "0");
+                    taglib_apetag->addValue(APE_TAG_COMPILATION, "0");
                 }
             }
             if(changedflag & CHANGED_DATA_ALBUMARTIST)
                 }
             }
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_ape_label_frame(taglib_apetag, "TRACK_LABELS",  track_labels_str);
+                check_ape_label_frame(taglib_apetag, "TRACK_LABELS",  track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_ape_label_frame(taglib_apetag, "ARTIST_LABELS", artist_labels_str);
+                check_ape_label_frame(taglib_apetag, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_ape_label_frame(taglib_apetag, "ALBUM_LABELS",  album_labels_str);
+                check_ape_label_frame(taglib_apetag, "ALBUM_LABELS",  album_labels_string);
             write_virtual_tags((TagLib::Tag *)taglib_apetag);
         }
     }

libtaginfo/asfinfo.cc

             read_virtual_tags((TagLib::Tag *)asf_tag);
             
             if(asf_tag->attributeListMap().contains("WM/PartOfSet")) {
-                disk_str = asf_tag->attributeListMap()[ "WM/PartOfSet" ].front().toString();
+                disk_string = asf_tag->attributeListMap()[ "WM/PartOfSet" ].front().toString();
             }
             if(asf_tag->attributeListMap().contains("WM/Composer")) {
                 composer = asf_tag->attributeListMap()[ "WM/Composer" ].front().toString();
 
             if(track_labels.size() == 0) {
                 if(asf_tag->attributeListMap().contains("TRACK_LABELS")){
-                    track_labels_str = asf_tag->attributeListMap()[ "TRACK_LABELS" ].front().toString();
+                    track_labels_string = asf_tag->attributeListMap()[ "TRACK_LABELS" ].front().toString();
                 }
             }
             if(artist_labels.size() == 0) {
                 if(asf_tag->attributeListMap().contains("ARTIST_LABELS"))
                 {
-                    artist_labels_str = asf_tag->attributeListMap()[ "ARTIST_LABELS" ].front().toString();
-//                    artist_labels = artist_labels_str.split("|");
+                    artist_labels_string = asf_tag->attributeListMap()[ "ARTIST_LABELS" ].front().toString();
+//                    artist_labels = artist_labels_string.split("|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(asf_tag->attributeListMap().contains("ALBUM_LABELS"))
                 {
-                    album_labels_str = asf_tag->attributeListMap()[ "ALBUM_LABELS" ].front().toString();
-//                    album_labels = album_labels_str.split("|");
+                    album_labels_string = asf_tag->attributeListMap()[ "ALBUM_LABELS" ].front().toString();
+//                    album_labels = album_labels_string.split("|");
                 }
             }
         }
         if(changedflag) {
             if(changedflag & CHANGED_DATA_DISK_STR) {
                 asf_tag->removeItem("WM/PartOfSet");
-                asf_tag->setAttribute("WM/PartOfSet", disk_str);
+                asf_tag->setAttribute("WM/PartOfSet", disk_string);
             }
             if(changedflag & CHANGED_COMPOSER_TAG) {
                 asf_tag->removeItem("WM/Composer");
             }
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_asf_label_frame(asf_tag, "TRACK_LABELS", track_labels_str);
+                check_asf_label_frame(asf_tag, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_asf_label_frame(asf_tag, "ARTIST_LABELS", artist_labels_str);
+                check_asf_label_frame(asf_tag, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_asf_label_frame(asf_tag, "ALBUM_LABELS", album_labels_str);
+                check_asf_label_frame(asf_tag, "ALBUM_LABELS", album_labels_string);
             write_virtual_tags((TagLib::Tag *)asf_tag);
         }
     }

libtaginfo/flacinfo.cc

                 composer = xiphcomment->fieldListMap()["COMPOSER"].front();
             }
             if(xiphcomment->fieldListMap().contains("DISCNUMBER")) {
-                disk_str = xiphcomment->fieldListMap()["DISCNUMBER"].front();
+                disk_string = xiphcomment->fieldListMap()["DISCNUMBER"].front();
             }
             if(xiphcomment->fieldListMap().contains("COMPILATION")) {
                 is_compilation = xiphcomment->fieldListMap()["COMPILATION"].front() == String("1");
             }
             // Rating
             if(xiphcomment->fieldListMap().contains("RATING")) {
-                long Rating = 0;
-                Rating = atol(xiphcomment->fieldListMap()["RATING"].front().toCString(true));
-                if(Rating) {
-                    if(Rating > 5) {
-                        rating = popularity_to_rating(Rating);
-                    }
-                    else {
-                        rating = Rating;
-                    }
+                long rat = 0;
+                rat = atol(xiphcomment->fieldListMap()["RATING"].front().toCString(true));
+                if(rat != 0) {
+                    if(rat > 5)
+                        rating = popularity_to_rating(rat);
+                    else
+                        rating = rat;
                 }
             }
             if(xiphcomment->fieldListMap().contains("PLAY_COUNTER")) {
-                long PlayCount = 0;
-                PlayCount = atol(xiphcomment->fieldListMap()["PLAY_COUNTER"].front().toCString(false));
-                playcount = PlayCount;
+                long playcnt = 0;
+                playcnt = atol(xiphcomment->fieldListMap()["PLAY_COUNTER"].front().toCString(false));
+                playcount = playcnt;
             }
             // Labels
             if(track_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("TRACK_LABELS")) {
-                    track_labels_str = xiphcomment->fieldListMap()["TRACK_LABELS"].front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = xiphcomment->fieldListMap()["TRACK_LABELS"].front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("ARTIST_LABELS")) {
-                    artist_labels_str = xiphcomment->fieldListMap()["ARTIST_LABELS"].front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = xiphcomment->fieldListMap()["ARTIST_LABELS"].front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("ALBUM_LABELS")) {
-                    album_labels_str = xiphcomment->fieldListMap()["ALBUM_LABELS"].front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = xiphcomment->fieldListMap()["ALBUM_LABELS"].front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             if(xiphcomment->contains("COVERART")) {// TODO
     if(xiphcomment) {
         if(changedflag) {
             if(changedflag & CHANGED_DATA_DISK_STR)
-                xiphcomment->addField("DISCNUMBER", disk_str);
+                xiphcomment->addField("DISCNUMBER", disk_string);
             if(changedflag & CHANGED_COMPOSER_TAG)
                 xiphcomment->addField("COMPOSER", composer);
             
             }
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_xiph_label_frame(xiphcomment, "TRACK_LABELS", track_labels_str);
+                check_xiph_label_frame(xiphcomment, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_xiph_label_frame(xiphcomment, "ARTIST_LABELS", artist_labels_str);
+                check_xiph_label_frame(xiphcomment, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_xiph_label_frame(xiphcomment, "ALBUM_LABELS", album_labels_str);
+                check_xiph_label_frame(xiphcomment, "ALBUM_LABELS", album_labels_string);
             
             write_virtual_tags((TagLib::Tag *)xiphcomment);
         }

libtaginfo/id3_common.cc

 
 
 TagLib::ID3v2::PopularimeterFrame * get_popularity_frame(TagLib::ID3v2::Tag * tag, const TagLib::String &email) {
-    TagLib::ID3v2::FrameList PopMList = tag->frameList("POPM");
-    for(TagLib::ID3v2::FrameList::Iterator it = PopMList.begin(); it != PopMList.end(); ++it) {
-            TagLib::ID3v2::PopularimeterFrame * PopMFrame = static_cast<TagLib::ID3v2::PopularimeterFrame *>(* it);
-        if(email.isEmpty() || (PopMFrame->email() == email)) {
-            return PopMFrame;
+    TagLib::ID3v2::FrameList popularity_frame_list = tag->frameList("POPM");
+    for(TagLib::ID3v2::FrameList::Iterator it = popularity_frame_list.begin(); it != popularity_frame_list.end(); ++it) {
+            TagLib::ID3v2::PopularimeterFrame * popularity_frame = static_cast<TagLib::ID3v2::PopularimeterFrame *>(* it);
+        if(email.isEmpty() || (popularity_frame->email() == email)) {
+            return popularity_frame;
         }
     }
     return NULL;

libtaginfo/info.cc

     return genre;
 }
 
-void Info::set_disk_string(String new_genre) {
-    genre = disk_str;
+void Info::set_disk_string(String new_disk_string) {
+    disk_string = new_disk_string;
     changedflag |= CHANGED_DISK_STR;
 }
 String Info::get_disk_string() const {
-    return disk_str;
+    return disk_string;
 }
 
 void Info::set_artist(String new_artist) {
 
 void Info::set_track_labels_list(const StringList new_track_labels_list) {
     track_labels = new_track_labels_list; // TODO does this work for StringList
-    track_labels_str = join(new_track_labels_list, "|");
+    track_labels_string = join(new_track_labels_list, "|");
     changedflag |= CHANGED_TRACK_LABELS;
 }
 StringList Info::get_track_labels_list() const {
 
 void Info::set_artist_labels_list(const StringList new_artist_labels_list) {
     artist_labels = new_artist_labels_list;
-    artist_labels_str = join(new_artist_labels_list, "|");
+    artist_labels_string = join(new_artist_labels_list, "|");
     changedflag |= CHANGED_ARTIST_LABELS;
 }
 StringList Info::get_artist_labels_list() const {
 
 void Info::set_album_labels_list(const StringList new_album_labels_list) {
     album_labels = new_album_labels_list;
-    album_labels_str = join(new_album_labels_list, "|");
+    album_labels_string = join(new_album_labels_list, "|");
     changedflag |= CHANGED_ALBUM_LABELS;
 }
 StringList Info::get_album_labels_list() const {

libtaginfo/mp3info.cc

             if(!taglib_tag)
                 read_virtual_tags((TagLib::Tag *)taglib_tagId3v2);
             if(taglib_tagId3v2->frameListMap().contains("TPOS")) {
-                disk_str = taglib_tagId3v2->frameListMap()[ "TPOS" ].front()->toString();
+                disk_string = taglib_tagId3v2->frameListMap()[ "TPOS" ].front()->toString();
             }
             if(taglib_tagId3v2->frameListMap().contains("TCOM")) {
                 composer = taglib_tagId3v2->frameListMap()[ "TCOM" ].front()->toString();
             if(taglib_tagId3v2->frameListMap().contains("TCMP")) {
                 is_compilation = (taglib_tagId3v2->frameListMap()["TCMP"].front()->toString()) == String("1");
             }
-            TagLib::ID3v2::PopularimeterFrame * PopMFrame = NULL;
+            TagLib::ID3v2::PopularimeterFrame * popularity_frame = NULL;
 
-            PopMFrame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
-            if(!PopMFrame)
-                PopMFrame = get_popularity_frame(taglib_tagId3v2, "");
+            popularity_frame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
+            if(!popularity_frame)
+                popularity_frame = get_popularity_frame(taglib_tagId3v2, "");
             
-            if(PopMFrame) {
-                rating    = popularity_to_rating(PopMFrame->rating());
-                playcount = PopMFrame->counter();
+            if(popularity_frame) {
+                rating    = popularity_to_rating(popularity_frame->rating());
+                playcount = popularity_frame->counter();
             }
             if(track_labels.size() == 0) {
                 ID3v2::UserTextIdentificationFrame * frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "TRACK_LABELS");
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "TRACKLABELS");
                 if(frame) {
-                    StringList TrLabelsList = frame->fieldList();
-                    if(TrLabelsList.size()) {
-                        track_labels_str = TrLabelsList[ 1 ];
-                        track_labels = split(track_labels_str, "|");
+                    StringList track_labels_list = frame->fieldList();
+                    if(track_labels_list.size()) {
+                        track_labels_string = track_labels_list[1];
+                        track_labels = split(track_labels_string, "|");
                     }
                 }
             }
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ARTISTLABELS");
                 if(frame) {
-                    StringList ArLabelsList = frame->fieldList();
-                    if(ArLabelsList.size()) {
-                        artist_labels_str = ArLabelsList[ 1 ];//.toCString(true);
-                        artist_labels = split(artist_labels_str, "|");
+                    StringList artist_labels_list = frame->fieldList();
+                    if(artist_labels_list.size()) {
+                        artist_labels_string = artist_labels_list[1];//.toCString(true);
+                        artist_labels = split(artist_labels_string, "|");
                     }
                 }
             }
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ALBUMLABELS");
                 if(frame) {
-                    StringList AlLabelsList = frame->fieldList();
-                    if(AlLabelsList.size()) {
-                        album_labels_str = AlLabelsList[1];//.toCString(true);
-                        album_labels = split(album_labels_str, "|");
+                    StringList album_labels_list = frame->fieldList();
+                    if(album_labels_list.size()) {
+                        album_labels_string = album_labels_list[1];//.toCString(true);
+                        album_labels = split(album_labels_string, "|");
                     }
                 }
             }
             if(changedflag & CHANGED_DATA_DISK_STR) {
                 taglib_tagId3v2->removeFrames("TPOS");
                 frame = new TagLib::ID3v2::TextIdentificationFrame("TPOS");
-                frame->setText(disk_str);
+                frame->setText(disk_string);
                 taglib_tagId3v2->addFrame(frame);
             }
             if(changedflag & CHANGED_COMPOSER_TAG) {
             }
             if(changedflag & CHANGED_DATA_RATING) {
                 printf("Writing ratings and playcount...\n");
-                TagLib::ID3v2::PopularimeterFrame * PopMFrame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
-                if(!PopMFrame) {
-                    PopMFrame = new TagLib::ID3v2::PopularimeterFrame();
-                    taglib_tagId3v2->addFrame(PopMFrame);
-                    PopMFrame->setEmail("LibTagInfo");
+                TagLib::ID3v2::PopularimeterFrame * popularity_frame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
+                if(!popularity_frame) {
+                    popularity_frame = new TagLib::ID3v2::PopularimeterFrame();
+                    taglib_tagId3v2->addFrame(popularity_frame);
+                    popularity_frame->setEmail("LibTagInfo");
                 }
-                PopMFrame->setRating(rating_to_popularity(rating));
-                PopMFrame->setCounter(playcount);
+                popularity_frame->setRating(rating_to_popularity(rating));
+                popularity_frame->setCounter(playcount);
             }
             
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "TRACK_LABELS", track_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "ARTIST_LABELS", artist_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "ALBUM_LABELS", album_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "ALBUM_LABELS", album_labels_string);
             
             write_virtual_tags((TagLib::Tag *)taglib_tagId3v2);
         }

libtaginfo/mp4info.cc

                 composer = mp4_tag->itemListMap()["\xa9wrt"].toStringList().front();
             }
             if(mp4_tag->itemListMap().contains("disk")) {
-                disk_str = format("%i/%i", mp4_tag->itemListMap()["disk"].toIntPair().first,
+                disk_string = format("%i/%i", mp4_tag->itemListMap()["disk"].toIntPair().first,
                                            mp4_tag->itemListMap()["disk"].toIntPair().second).c_str();
             }
             if(mp4_tag->itemListMap().contains("cpil")) {
             // Labels
             if(track_labels.size() == 0) {
                 if(mp4_tag->itemListMap().contains("----:com.apple.iTunes:TRACK_LABELS")) {
-                    track_labels_str = mp4_tag->itemListMap()["----:com.apple.iTunes:TRACK_LABELS"].toStringList().front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = mp4_tag->itemListMap()["----:com.apple.iTunes:TRACK_LABELS"].toStringList().front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(mp4_tag->itemListMap().contains("----:com.apple.iTunes:ARTIST_LABELS")) {
-                    artist_labels_str = mp4_tag->itemListMap()["----:com.apple.iTunes:ARTIST_LABELS"].toStringList().front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = mp4_tag->itemListMap()["----:com.apple.iTunes:ARTIST_LABELS"].toStringList().front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(mp4_tag->itemListMap().contains("----:com.apple.iTunes:ALBUM_LABELS")) {
-                    album_labels_str = mp4_tag->itemListMap()["----:com.apple.iTunes:ALBUM_LABELS"].toStringList().front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = mp4_tag->itemListMap()["----:com.apple.iTunes:ALBUM_LABELS"].toStringList().front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             if(mp4_tag->itemListMap().contains("covr")) {
             if(changedflag & CHANGED_DATA_DISK_STR) {
                 int first;
                 int second;
-                string_disk_to_disk_num(disk_str.toCString(true), first, second);
+                string_disk_to_disk_num(disk_string.toCString(true), first, second);
                 mp4_tag->itemListMap()["disk"] = TagLib::MP4::Item(first, second);
             }
             if(changedflag & CHANGED_IS_COMPILATION_TAG)
             }
             // The Labels
             if(changedflag & CHANGED_ARTIST_LABELS)
-                mp4_check_label_frame(mp4_tag, "----:com.apple.iTunes:ARTIST_LABELS", artist_labels_str);
+                mp4_check_label_frame(mp4_tag, "----:com.apple.iTunes:ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                mp4_check_label_frame(mp4_tag, "----:com.apple.iTunes:ALBUM_LABELS", album_labels_str);
+                mp4_check_label_frame(mp4_tag, "----:com.apple.iTunes:ALBUM_LABELS", album_labels_string);
             if(changedflag & CHANGED_TRACK_LABELS)
-                mp4_check_label_frame(mp4_tag, "----:com.apple.iTunes:TRACK_LABELS", track_labels_str);
+                mp4_check_label_frame(mp4_tag, "----:com.apple.iTunes:TRACK_LABELS", track_labels_string);
             
             write_virtual_tags((TagLib::Tag *)mp4_tag);
         }

libtaginfo/mpcinfo.cc

                 composer = taglib_apetag->itemListMap()["COMPOSER"].toStringList().front();
             }
             if(taglib_apetag->itemListMap().contains("DISCNUMBER")) {
-                disk_str = taglib_apetag->itemListMap()["DISCNUMBER"].toStringList().front();
+                disk_string = taglib_apetag->itemListMap()["DISCNUMBER"].toStringList().front();
             }
             if(taglib_apetag->itemListMap().contains("COMPILATION")) {
                 is_compilation = 
             // Labels
             if(track_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("TRACK_LABELS")) {
-                    track_labels_str = taglib_apetag->itemListMap()["TRACK_LABELS"].toStringList().front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = taglib_apetag->itemListMap()["TRACK_LABELS"].toStringList().front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("ARTIST_LABELS")) {
-                    artist_labels_str = taglib_apetag->itemListMap()["ARTIST_LABELS"].toStringList().front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = taglib_apetag->itemListMap()["ARTIST_LABELS"].toStringList().front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("ALBUM_LABELS")) {
-                    album_labels_str = taglib_apetag->itemListMap()["ALBUM_LABELS"].toStringList().front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = taglib_apetag->itemListMap()["ALBUM_LABELS"].toStringList().front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             if(taglib_apetag->itemListMap().contains("Cover Art (front)")) {
             if(changedflag & CHANGED_COMPOSER_TAG)
                 taglib_apetag->addValue("COMPOSER", composer);
             if(changedflag & CHANGED_DISK_STR)
-                taglib_apetag->addValue("DISCNUMBER", disk_str);
+                taglib_apetag->addValue("DISCNUMBER", disk_string);
             
             if(changedflag & CHANGED_IS_COMPILATION_TAG) {
                 if(is_compilation) {
             }
             // Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_ape_label_frame(taglib_apetag, "TRACK_LABELS",  track_labels_str);
+                check_ape_label_frame(taglib_apetag, "TRACK_LABELS",  track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_ape_label_frame(taglib_apetag, "ARTIST_LABELS", artist_labels_str);
+                check_ape_label_frame(taglib_apetag, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_ape_label_frame(taglib_apetag, "ALBUM_LABELS",  album_labels_str);
+                check_ape_label_frame(taglib_apetag, "ALBUM_LABELS",  album_labels_string);
             
             write_virtual_tags((TagLib::Tag *)taglib_apetag);
         }

libtaginfo/ogginfo.cc

                 composer = xiphcomment->fieldListMap()["COMPOSER"].front();
             }
             if(xiphcomment->fieldListMap().contains("DISCNUMBER")) {
-                disk_str = xiphcomment->fieldListMap()["DISCNUMBER"].front();
+                disk_string = xiphcomment->fieldListMap()["DISCNUMBER"].front();
             }
             if(xiphcomment->fieldListMap().contains("COMPILATION")) {
                 is_compilation = xiphcomment->fieldListMap()["COMPILATION"].front() == String("1");
             // Labels
             if(track_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("TRACK_LABELS")) {
-                    track_labels_str = xiphcomment->fieldListMap()["TRACK_LABELS"].front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = xiphcomment->fieldListMap()["TRACK_LABELS"].front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("ARTIST_LABELS")) {
-                    artist_labels_str = xiphcomment->fieldListMap()["ARTIST_LABELS"].front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = xiphcomment->fieldListMap()["ARTIST_LABELS"].front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("ALBUM_LABELS")) {
-                    album_labels_str = xiphcomment->fieldListMap()["ALBUM_LABELS"].front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = xiphcomment->fieldListMap()["ALBUM_LABELS"].front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             if(xiphcomment->contains("COVERART")) // TODO
     if(xiphcomment) {
         if(changedflag) {
             if(changedflag & CHANGED_DATA_DISK_STR)
-                xiphcomment->addField("DISCNUMBER", disk_str);
+                xiphcomment->addField("DISCNUMBER", disk_string);
             
             if(changedflag & CHANGED_COMPOSER_TAG)
                 xiphcomment->addField("COMPOSER", composer);
             }
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_xiph_label_frame(xiphcomment, "TRACK_LABELS", track_labels_str);
+                check_xiph_label_frame(xiphcomment, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_xiph_label_frame(xiphcomment, "ARTIST_LABELS", artist_labels_str);
+                check_xiph_label_frame(xiphcomment, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_xiph_label_frame(xiphcomment, "ALBUM_LABELS", album_labels_str);
+                check_xiph_label_frame(xiphcomment, "ALBUM_LABELS", album_labels_string);
             
             write_virtual_tags((TagLib::Tag *)xiphcomment);
         }

libtaginfo/speexinfo.cc

                 composer = xiphcomment->fieldListMap()["COMPOSER"].front();
             }
             if(xiphcomment->fieldListMap().contains("DISCNUMBER")) {
-                disk_str = xiphcomment->fieldListMap()["DISCNUMBER"].front();
+                disk_string = xiphcomment->fieldListMap()["DISCNUMBER"].front();
             }
             if(xiphcomment->fieldListMap().contains("COMPILATION")) {
                 is_compilation = xiphcomment->fieldListMap()["COMPILATION"].front() == String("1");
             // Labels
             if(track_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("TRACK_LABELS")) {
-                    track_labels_str = xiphcomment->fieldListMap()["TRACK_LABELS"].front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = xiphcomment->fieldListMap()["TRACK_LABELS"].front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("ARTIST_LABELS")) {
-                    artist_labels_str = xiphcomment->fieldListMap()["ARTIST_LABELS"].front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = xiphcomment->fieldListMap()["ARTIST_LABELS"].front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(xiphcomment->fieldListMap().contains("ALBUM_LABELS")) {
-                    album_labels_str = xiphcomment->fieldListMap()["ALBUM_LABELS"].front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = xiphcomment->fieldListMap()["ALBUM_LABELS"].front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             if(xiphcomment->contains("COVERART")) // TODO
     if(xiphcomment) {
         if(changedflag) {
             if(changedflag & CHANGED_DATA_DISK_STR)
-                xiphcomment->addField("DISCNUMBER", disk_str);
+                xiphcomment->addField("DISCNUMBER", disk_string);
             
             if(changedflag & CHANGED_COMPOSER_TAG)
                 xiphcomment->addField("COMPOSER", composer);
             }
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_xiph_label_frame(xiphcomment, "TRACK_LABELS", track_labels_str);
+                check_xiph_label_frame(xiphcomment, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_xiph_label_frame(xiphcomment, "ARTIST_LABELS", artist_labels_str);
+                check_xiph_label_frame(xiphcomment, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_xiph_label_frame(xiphcomment, "ALBUM_LABELS", album_labels_str);
+                check_xiph_label_frame(xiphcomment, "ALBUM_LABELS", album_labels_string);
             
             write_virtual_tags((TagLib::Tag *)xiphcomment);
         }

libtaginfo/taginfo.h

             String comments;
             int    tracknumber;
             int    year;
-            String disk_str;
+            String disk_string;
             bool   is_compilation;
             
             //Audioproperties
             int playcount;
             int rating;
             StringList track_labels;
-            String track_labels_str;
+            String track_labels_string;
             StringList artist_labels;
-            String artist_labels_str;
+            String artist_labels_string;
             StringList album_labels;
-            String album_labels_str;
+            String album_labels_string;
             
             int changedflag;
             bool has_image;

libtaginfo/trueaudioinfo.cc

             if(!taglib_tag)
                 read_virtual_tags((TagLib::Tag *)taglib_tagId3v2);
             if(taglib_tagId3v2->frameListMap().contains("TPOS")) {
-                disk_str = taglib_tagId3v2->frameListMap()[ "TPOS" ].front()->toString();
+                disk_string = taglib_tagId3v2->frameListMap()[ "TPOS" ].front()->toString();
             }
             if(taglib_tagId3v2->frameListMap().contains("TCOM")) {
                 composer = taglib_tagId3v2->frameListMap()[ "TCOM" ].front()->toString();
             if(taglib_tagId3v2->frameListMap().contains("TCMP")) {
                 is_compilation = taglib_tagId3v2->frameListMap()[ "TCMP" ].front()->toString() == String("1");
             }
-            TagLib::ID3v2::PopularimeterFrame * PopMFrame = NULL;
-
-            PopMFrame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
-            if(!PopMFrame)
-                PopMFrame = get_popularity_frame(taglib_tagId3v2, "");
-            if(PopMFrame) {
-                rating = popularity_to_rating(PopMFrame->rating());
-                playcount = PopMFrame->counter();
+            TagLib::ID3v2::PopularimeterFrame * popularity_frame = NULL;
+
+            popularity_frame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
+            if(!popularity_frame)
+                popularity_frame = get_popularity_frame(taglib_tagId3v2, "");
+            if(popularity_frame) {
+                rating = popularity_to_rating(popularity_frame->rating());
+                playcount = popularity_frame->counter();
             }
             if(track_labels.size() == 0) {
                 ID3v2::UserTextIdentificationFrame * frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "TRACK_LABELS");
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "TRACKLABELS");
                 if(frame) {
-                    track_labels_str = frame->fieldList()[ 1 ];
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = frame->fieldList()[1];
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ARTISTLABELS");
                 if(frame) {
-                    artist_labels_str = frame->fieldList()[ 1 ];
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = frame->fieldList()[1];
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                     ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ALBUM_LABELS");
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ALBUMLABELS");
                 if(frame) {
-                    album_labels_str = frame->fieldList()[ 1 ];
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = frame->fieldList()[1];
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             TagLib::ID3v2::FrameList frameList = taglib_tagId3v2->frameListMap()["APIC"];
             if(changedflag & CHANGED_DATA_DISK_STR) {
                 taglib_tagId3v2->removeFrames("TPOS");
                 frame = new TagLib::ID3v2::TextIdentificationFrame("TPOS");
-                frame->setText(disk_str);
+                frame->setText(disk_string);
                 taglib_tagId3v2->addFrame(frame);
             }
             if(changedflag & CHANGED_COMPOSER_TAG) {
             }
             if(changedflag & CHANGED_DATA_RATING) {
                 printf("Writing ratings and playcount...\n");
-                TagLib::ID3v2::PopularimeterFrame * PopMFrame = 
+                TagLib::ID3v2::PopularimeterFrame * popularity_frame = 
                     get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
-                if(!PopMFrame) {
-                    PopMFrame = new TagLib::ID3v2::PopularimeterFrame();
-                    taglib_tagId3v2->addFrame(PopMFrame);
-                    PopMFrame->setEmail("LibTagInfo");
+                if(!popularity_frame) {
+                    popularity_frame = new TagLib::ID3v2::PopularimeterFrame();
+                    taglib_tagId3v2->addFrame(popularity_frame);
+                    popularity_frame->setEmail("LibTagInfo");
                 }
-                PopMFrame->setRating(rating_to_popularity(rating));
-                PopMFrame->setCounter(playcount);
+                popularity_frame->setRating(rating_to_popularity(rating));
+                popularity_frame->setCounter(playcount);
             }
             
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "TRACK_LABELS", track_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "ARTIST_LABELS", artist_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "ALBUM_LABELS", album_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "ALBUM_LABELS", album_labels_string);
             
             
             write_virtual_tags((TagLib::Tag *)taglib_tagId3v2);

libtaginfo/waveinfo.cc

             if(!taglib_tag)
                 read_virtual_tags((TagLib::Tag *)taglib_tagId3v2);
             if(taglib_tagId3v2->frameListMap().contains("TPOS")) {
-                disk_str = taglib_tagId3v2->frameListMap()[ "TPOS" ].front()->toString();
+                disk_string = taglib_tagId3v2->frameListMap()[ "TPOS" ].front()->toString();
             }
             if(taglib_tagId3v2->frameListMap().contains("TCOM")) {
                 composer = taglib_tagId3v2->frameListMap()[ "TCOM" ].front()->toString();
             if(taglib_tagId3v2->frameListMap().contains("TCMP")) {
                 is_compilation = (taglib_tagId3v2->frameListMap()["TCMP"].front()->toString()) == String("1");
             }
-            TagLib::ID3v2::PopularimeterFrame * PopMFrame = NULL;
+            TagLib::ID3v2::PopularimeterFrame * popularity_frame = NULL;
 
-            PopMFrame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
-            if(!PopMFrame)
-                PopMFrame = get_popularity_frame(taglib_tagId3v2, "");
+            popularity_frame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
+            if(!popularity_frame)
+                popularity_frame = get_popularity_frame(taglib_tagId3v2, "");
             
-            if(PopMFrame) {
-                rating    = popularity_to_rating(PopMFrame->rating());
-                playcount = PopMFrame->counter();
+            if(popularity_frame) {
+                rating    = popularity_to_rating(popularity_frame->rating());
+                playcount = popularity_frame->counter();
             }
             if(track_labels.size() == 0) {
                 ID3v2::UserTextIdentificationFrame * frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "TRACK_LABELS");
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "TRACKLABELS");
                 if(frame) {
-                    StringList TrLabelsList = frame->fieldList();
-                    if(TrLabelsList.size()) {
-                        track_labels_str = TrLabelsList[ 1 ];
-                        track_labels = split(track_labels_str, "|");
+                    StringList track_labels_list = frame->fieldList();
+                    if(track_labels_list.size()) {
+                        track_labels_string = track_labels_list[1];
+                        track_labels = split(track_labels_string, "|");
                     }
                 }
             }
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ARTISTLABELS");
                 if(frame) {
-                    StringList ArLabelsList = frame->fieldList();
-                    if(ArLabelsList.size()) {
-                        artist_labels_str = ArLabelsList[ 1 ];//.toCString(true);
-                        artist_labels = split(artist_labels_str, "|");
+                    StringList artist_labels_list = frame->fieldList();
+                    if(artist_labels_list.size()) {
+                        artist_labels_string = artist_labels_list[1];//.toCString(true);
+                        artist_labels = split(artist_labels_string, "|");
                     }
                 }
             }
             if(album_labels.size() == 0) {
-                ID3v2::UserTextIdentificationFrame * frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ALBUM_LABELS");
+                ID3v2::UserTextIdentificationFrame * frame = 
+                    ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ALBUM_LABELS");
                 if(!frame)
                     frame = ID3v2::UserTextIdentificationFrame::find(taglib_tagId3v2, "ALBUMLABELS");
                 if(frame) {
-                    StringList AlLabelsList = frame->fieldList();
-                    if(AlLabelsList.size()) {
-                        album_labels_str = AlLabelsList[1];//.toCString(true);
-                        album_labels = split(album_labels_str, "|");
+                    StringList album_labels_list = frame->fieldList();
+                    if(album_labels_list.size()) {
+                        album_labels_string = album_labels_list[1];//.toCString(true);
+                        album_labels = split(album_labels_string, "|");
                     }
                 }
             }
             if(changedflag & CHANGED_DATA_DISK_STR) {
                 taglib_tagId3v2->removeFrames("TPOS");
                 frame = new TagLib::ID3v2::TextIdentificationFrame("TPOS");
-                frame->setText(disk_str);
+                frame->setText(disk_string);
                 taglib_tagId3v2->addFrame(frame);
             }
             if(changedflag & CHANGED_COMPOSER_TAG) {
             }
             if(changedflag & CHANGED_DATA_RATING) {
                 printf("Writing ratings and playcount...\n");
-                TagLib::ID3v2::PopularimeterFrame * PopMFrame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
-                if(!PopMFrame) {
-                    PopMFrame = new TagLib::ID3v2::PopularimeterFrame();
-                    taglib_tagId3v2->addFrame(PopMFrame);
-                    PopMFrame->setEmail("LibTagInfo");
+                TagLib::ID3v2::PopularimeterFrame * popularity_frame = get_popularity_frame(taglib_tagId3v2, "LibTagInfo");
+                if(!popularity_frame) {
+                    popularity_frame = new TagLib::ID3v2::PopularimeterFrame();
+                    taglib_tagId3v2->addFrame(popularity_frame);
+                    popularity_frame->setEmail("LibTagInfo");
                 }
-                PopMFrame->setRating(rating_to_popularity(rating));
-                PopMFrame->setCounter(playcount);
+                popularity_frame->setRating(rating_to_popularity(rating));
+                popularity_frame->setCounter(playcount);
             }
             
             // The Labels
             if(changedflag & CHANGED_TRACK_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "TRACK_LABELS", track_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "TRACK_LABELS", track_labels_string);
             if(changedflag & CHANGED_ARTIST_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "ARTIST_LABELS", artist_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                id3v2_check_label_frame(taglib_tagId3v2, "ALBUM_LABELS", album_labels_str);
+                id3v2_check_label_frame(taglib_tagId3v2, "ALBUM_LABELS", album_labels_string);
             
             write_virtual_tags((TagLib::Tag *)taglib_tagId3v2);
         }

libtaginfo/wavpackinfo.cc

                 composer = taglib_apetag->itemListMap()["COMPOSER"].toStringList().front();
             }
             if(taglib_apetag->itemListMap().contains("DISCNUMBER")) {
-                disk_str = taglib_apetag->itemListMap()["DISCNUMBER"].toStringList().front();
+                disk_string = taglib_apetag->itemListMap()["DISCNUMBER"].toStringList().front();
             }
             if(taglib_apetag->itemListMap().contains("COMPILATION")) {
                 is_compilation = taglib_apetag->itemListMap()["COMPILATION"].toStringList().front() == String("1");
             // Labels
             if(track_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("TRACK_LABELS")) {
-                    track_labels_str = taglib_apetag->itemListMap()["TRACK_LABELS"].toStringList().front();
-                    track_labels = split(track_labels_str, "|");
+                    track_labels_string = taglib_apetag->itemListMap()["TRACK_LABELS"].toStringList().front();
+                    track_labels = split(track_labels_string, "|");
                 }
             }
             if(artist_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("ARTIST_LABELS")) {
-                    artist_labels_str = taglib_apetag->itemListMap()["ARTIST_LABELS"].toStringList().front();
-                    artist_labels = split(artist_labels_str, "|");
+                    artist_labels_string = taglib_apetag->itemListMap()["ARTIST_LABELS"].toStringList().front();
+                    artist_labels = split(artist_labels_string, "|");
                 }
             }
             if(album_labels.size() == 0) {
                 if(taglib_apetag->itemListMap().contains("ALBUM_LABELS")) {
-                    album_labels_str = taglib_apetag->itemListMap()["ALBUM_LABELS"].toStringList().front();
-                    album_labels = split(album_labels_str, "|");
+                    album_labels_string = taglib_apetag->itemListMap()["ALBUM_LABELS"].toStringList().front();
+                    album_labels = split(album_labels_string, "|");
                 }
             }
             return true; 
             if(changedflag & CHANGED_COMPOSER_TAG)
                 taglib_apetag->addValue("COMPOSER", composer);
             if(changedflag & CHANGED_DATA_DISK_STR)
-                taglib_apetag->addValue("DISCNUMBER", disk_str);
+                taglib_apetag->addValue("DISCNUMBER", disk_string);
             
             if(changedflag & CHANGED_IS_COMPILATION_TAG) {
                 if(is_compilation) {
             }
             // The Labels
             if(changedflag & CHANGED_ARTIST_LABELS)
-                check_ape_label_frame(taglib_apetag, "ARTIST_LABELS", artist_labels_str);
+                check_ape_label_frame(taglib_apetag, "ARTIST_LABELS", artist_labels_string);
             if(changedflag & CHANGED_ALBUM_LABELS)
-                check_ape_label_frame(taglib_apetag, "ALBUM_LABELS", album_labels_str);
+                check_ape_label_frame(taglib_apetag, "ALBUM_LABELS", album_labels_string);
             if(changedflag & CHANGED_TRACK_LABELS)
-                check_ape_label_frame(taglib_apetag, "TRACK_LABELS", track_labels_str);
+                check_ape_label_frame(taglib_apetag, "TRACK_LABELS", track_labels_string);
             
             write_virtual_tags((TagLib::Tag *)taglib_apetag);
         }