more cleanup

diff --git a/apic-read.cc b/apic-read.cc
index 324450e411147437d656fac1a28c2534d570307e..ad07b3d70d84172eed2c7e44f0e4e76fe31a6d74 100644 (file)
--- a/apic-read.cc
+++ b/apic-read.cc
@@ -12,9 +12,10 @@
 
 // some demo apic reading code; would be nice to save all APIC frames.
 
 
 // some demo apic reading code; would be nice to save all APIC frames.
 

-using TagLib::ID3v2::Tag;
-using TagLib::ID3v2::FrameList;

 using TagLib::ID3v2::AttachedPictureFrame;
 using TagLib::ID3v2::AttachedPictureFrame;

+using TagLib::ID3v2::Frame;
+using TagLib::ID3v2::FrameList;
+using TagLib::ID3v2::Tag;

 
 int
 main(int argc, char **argv)
 
 int
 main(int argc, char **argv)


@@ -28,17 +29,18 @@ main(int argc, char **argv)
     const FrameList &frames = id3v2tag->frameList();
     FrameList::ConstIterator it;
     for (it = frames.begin(); it != frames.end(); it++) {
     const FrameList &frames = id3v2tag->frameList();
     FrameList::ConstIterator it;
     for (it = frames.begin(); it != frames.end(); it++) {

-        TagLib::ByteVector frameid = (*it)->frameID();
+        Frame *frame = *it;
+        TagLib::ByteVector frameid = frame->frameID();

         uint frameid_size = frameid.size();
         char *frameid_s = new char[frameid_size + 1];
         memcpy(frameid_s, frameid.data(), frameid_size);
         frameid_s[frameid_size] = '\0';
         uint frameid_size = frameid.size();
         char *frameid_s = new char[frameid_size + 1];
         memcpy(frameid_s, frameid.data(), frameid_size);
         frameid_s[frameid_size] = '\0';

-        printf("%s: %s\n", frameid_s, (*it)->toString().toCString());
+        printf("%s: %s\n", frameid_s, frame->toString().toCString());

         if (frameid != "APIC") {
             continue;
         }
         if (frameid != "APIC") {
             continue;
         }

-        AttachedPictureFrame *frame = (AttachedPictureFrame *)(*it);
-        TagLib::ByteVector data = frame->picture();
+        AttachedPictureFrame *pic_frame = (AttachedPictureFrame *)frame;
+        TagLib::ByteVector data = pic_frame->picture();

         int fd = open(argv[2], O_CREAT | O_WRONLY);
         if (fd < 0) {
             perror("open");
         int fd = open(argv[2], O_CREAT | O_WRONLY);
         if (fd < 0) {
             perror("open");