From ce3567b100dd73baa1356444203e458366914d71 Mon Sep 17 00:00:00 2001
From:  <epg@pretzelnet.org>
Date: Sun, 8 Dec 2013 15:28:12 -0800
Subject: [PATCH 1/1] more cleanup

---
 apic-read.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apic-read.cc b/apic-read.cc
index 324450e..ad07b3d 100644
--- 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.
 
-using TagLib::ID3v2::Tag;
-using TagLib::ID3v2::FrameList;
 using TagLib::ID3v2::AttachedPictureFrame;
+using TagLib::ID3v2::Frame;
+using TagLib::ID3v2::FrameList;
+using TagLib::ID3v2::Tag;
 
 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++) {
-        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';
-        printf("%s: %s\n", frameid_s, (*it)->toString().toCString());
+        printf("%s: %s\n", frameid_s, frame->toString().toCString());
         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");
-- 
2.56.0