Make the Xing header publically accessible.

WISH:133757

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@593475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/taglib/mpeg/Makefile.am b/taglib/mpeg/Makefile.am
index b189c30c427eb8883e2a144fefe4f43c9d4b4267..330aec39ba94d5ba43095b3b03d7909f229eee31 100644 (file)
--- a/taglib/mpeg/Makefile.am
+++ b/taglib/mpeg/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = id3v1 id3v2
 INCLUDES = \
-       -I$(top_srcdir)/taglib\
+       -I$(top_srcdir)/taglib \
        -I$(top_srcdir)/taglib/toolkit \
         -I$(top_srcdir)/taglib/ape \
        -I$(top_srcdir)/taglib/mpeg/id3v2 -I./id3v2 \

diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp
index d50efbab98220e66fc167055649a9fe8b264cb0c..fced161c05afa912fe606f97cc8d0c7adabc3f37 100644 (file)
--- a/taglib/mpeg/mpegproperties.cpp
+++ b/taglib/mpeg/mpegproperties.cpp
@@ -33,28 +33,35 @@ class MPEG::Properties::PropertiesPrivate
 public:
   PropertiesPrivate(File *f, ReadStyle s) :
     file(f),
+    xingHeader(0),
     style(s),
     length(0),
     bitrate(0),
     sampleRate(0),
     channels(0),
-    version(Header::Version1),
     layer(0),
-    protectionEnabled(false),
+    version(Header::Version1),
     channelMode(Header::Stereo),
+    protectionEnabled(false),
     isCopyrighted(false),
     isOriginal(false) {}
 
+  ~PropertiesPrivate()
+  {
+    delete xingHeader;
+  }
+
   File *file;
+  XingHeader *xingHeader;
   ReadStyle style;
   int length;
   int bitrate;
   int sampleRate;
   int channels;
-  Header::Version version;
   int layer;
-  bool protectionEnabled;
+  Header::Version version;
   Header::ChannelMode channelMode;
+  bool protectionEnabled;
   bool isCopyrighted;
   bool isOriginal;
 };
@@ -96,6 +103,11 @@ int MPEG::Properties::channels() const
   return d->channels;
 }
 
+const MPEG::XingHeader *MPEG::Properties::xingHeader() const
+{
+  return d->xingHeader;
+}
+
 MPEG::Header::Version MPEG::Properties::version() const
 {
   return d->version;
@@ -191,34 +203,38 @@ void MPEG::Properties::read()
                                                            firstHeader.channelMode());
 
   d->file->seek(first + xingHeaderOffset);
-  XingHeader xingHeader(d->file->readBlock(16));
+  d->xingHeader = new XingHeader(d->file->readBlock(16));
 
   // Read the length and the bitrate from the Xing header.
 
-  if(xingHeader.isValid() &&
+  if(d->xingHeader->isValid() &&
      firstHeader.sampleRate() > 0 &&
-     xingHeader.totalFrames() > 0)
+     d->xingHeader->totalFrames() > 0)
   {
       static const int blockSize[] = { 0, 384, 1152, 1152 };
 
       double timePerFrame = blockSize[firstHeader.layer()];
       timePerFrame = firstHeader.sampleRate() > 0 ? timePerFrame / firstHeader.sampleRate() : 0;
-      d->length = int(timePerFrame * xingHeader.totalFrames());
-      d->bitrate = d->length > 0 ? xingHeader.totalSize() * 8 / d->length / 1000 : 0;
+      d->length = int(timePerFrame * d->xingHeader->totalFrames());
+      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / d->length / 1000 : 0;
   }
+  else {
+    // Since there was no valid Xing header found, we hope that we're in a constant
+    // bitrate file.
 
-  // Since there was no valid Xing header found, we hope that we're in a constant
-  // bitrate file.
+    delete d->xingHeader;
+    d->xingHeader = 0;
 
-  // TODO: Make this more robust with audio property detection for VBR without a
-  // Xing header.
+    // TODO: Make this more robust with audio property detection for VBR without a
+    // Xing header.
 
-  else if(firstHeader.frameLength() > 0 && firstHeader.bitrate() > 0) {
-    int frames = (last - first) / firstHeader.frameLength() + 1;
+    if(firstHeader.frameLength() > 0 && firstHeader.bitrate() > 0) {
+      int frames = (last - first) / firstHeader.frameLength() + 1;
 
-    d->length = int(float(firstHeader.frameLength() * frames) /
-                    float(firstHeader.bitrate() * 125) + 0.5);
-    d->bitrate = firstHeader.bitrate();
+      d->length = int(float(firstHeader.frameLength() * frames) /
+                      float(firstHeader.bitrate() * 125) + 0.5);
+      d->bitrate = firstHeader.bitrate();
+    }
   }
 
 

diff --git a/taglib/mpeg/mpegproperties.h b/taglib/mpeg/mpegproperties.h
index a2d4e4cbd459be5366cc8ac3fc95fc263d165f2a..3cd9210a55d8612ce09403556ccb5066813e0e7a 100644 (file)
--- a/taglib/mpeg/mpegproperties.h
+++ b/taglib/mpeg/mpegproperties.h
@@ -31,6 +31,7 @@ namespace TagLib {
   namespace MPEG {
 
     class File;
+    class XingHeader;
 
     //! An implementation of audio property reading for MP3
 
@@ -60,6 +61,13 @@ namespace TagLib {
       virtual int sampleRate() const;
       virtual int channels() const;
 
+      /*!
+       * Returns a pointer to the XingHeader if one exists or null if no
+       * XingHeader was found.
+       */
+
+      const XingHeader *xingHeader() const;
+
       /*!
        * Returns the MPEG Version of the file.
        */

diff --git a/taglib/mpeg/xingheader.h b/taglib/mpeg/xingheader.h
index 09e4bf91f113db05ccd0b1aeb30e089558abd996..a5c22ba602667c1a3c51e495fac3ff9c82c485a0 100644 (file)
--- a/taglib/mpeg/xingheader.h
+++ b/taglib/mpeg/xingheader.h
@@ -76,6 +76,7 @@ namespace TagLib {
          * Returns the offset for the start of this Xing header, given the
         * version and channels of the frame
          */
+        // BIC: rename to offset()
         static int xingHeaderOffset(TagLib::MPEG::Header::Version v,
                                     TagLib::MPEG::Header::ChannelMode c);