Matroska: Avoid inlined header methods, only install public headers

Author: ufleisch

taglib/CMakeLists.txt

@@ -72,6 +72,7 @@ if(WITH_MATROSKA)
 endif()
 include_directories(${tag_HDR_DIRS})
 
+set(tag_PRIVATE_HDRS)
 set(tag_HDRS
   tag.h
   fileref.h
@@ -233,14 +234,13 @@ if(WITH_MATROSKA)
     matroska/matroskachapter.h
     matroska/matroskachapteredition.h
     matroska/matroskachapters.h
-    matroska/matroskacues.h
     matroska/matroskaelement.h
     matroska/matroskafile.h
     matroska/matroskaproperties.h
-    matroska/matroskaseekhead.h
-    matroska/matroskasegment.h
     matroska/matroskasimpletag.h
     matroska/matroskatag.h
+  )
+  set(tag_PRIVATE_HDRS ${tag_PRIVATE_HDRS}
     matroska/ebml/ebmlbinaryelement.h
     matroska/ebml/ebmlelement.h
     matroska/ebml/ebmlmasterelement.h
@@ -257,6 +257,9 @@ if(WITH_MATROSKA)
     matroska/ebml/ebmlfloatelement.h
     matroska/ebml/ebmlutils.h
     matroska/ebml/ebmlvoidelement.h
+    matroska/matroskacues.h
+    matroska/matroskaseekhead.h
+    matroska/matroskasegment.h
   )
 endif()
 
@@ -517,7 +520,7 @@ set(tag_LIB_SRCS
   tagutils.cpp
 )
 
-add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
+add_library(tag ${tag_LIB_SRCS} ${tag_HDRS} ${tag_PRIVATE_HDRS})
 
 target_include_directories(tag INTERFACE
   $<INSTALL_INTERFACE:include>

taglib/matroska/ebml/ebmlbinaryelement.cpp

@@ -21,9 +21,35 @@
 #include "ebmlbinaryelement.h"
 #include "ebmlutils.h"
 #include "tfile.h"
+#include "tdebug.h"
 
 using namespace TagLib;
 
+EBML::BinaryElement::BinaryElement(Id id, int sizeLength, offset_t dataSize):
+  Element(id, sizeLength, dataSize)
+{
+}
+
+EBML::BinaryElement::BinaryElement(Id id, int sizeLength, offset_t dataSize, offset_t):
+  Element(id, sizeLength, dataSize)
+{
+}
+
+EBML::BinaryElement::BinaryElement(Id id):
+  Element(id, 0, 0)
+{
+}
+
+const ByteVector& EBML::BinaryElement::getValue() const
+{
+  return value;
+}
+
+void EBML::BinaryElement::setValue(const ByteVector& val)
+{
+  value = val;
+}
+
 bool EBML::BinaryElement::read(File &file)
 {
   value = file.readBlock(dataSize);

taglib/matroska/ebml/ebmlbinaryelement.h

@@ -27,19 +27,17 @@
 
 namespace TagLib {
   class File;
+
   namespace EBML {
     class BinaryElement : public Element
     {
     public:
-      BinaryElement(Id id, int sizeLength, offset_t dataSize) :
-        Element(id, sizeLength, dataSize) {}
-      BinaryElement(Id id, int sizeLength, offset_t dataSize, offset_t) :
-        Element(id, sizeLength, dataSize) {}
-      explicit BinaryElement(Id id) :
-        Element(id, 0, 0) {}
+      BinaryElement(Id id, int sizeLength, offset_t dataSize);
+      BinaryElement(Id id, int sizeLength, offset_t dataSize, offset_t);
+      explicit BinaryElement(Id id);
 
-      const ByteVector &getValue() const { return value; }
-      void setValue(const ByteVector &val) { value = val; }
+      const ByteVector &getValue() const;
+      void setValue(const ByteVector &val);
       bool read(File &file) override;
       ByteVector render() override;
 

taglib/matroska/ebml/ebmlelement.cpp

@@ -148,16 +148,54 @@ unsigned int EBML::Element::readId(File &file)
   return buffer.toUInt(true);
 }
 
+EBML::Element::Element(Id id, int sizeLength, offset_t dataSize):
+  id(id), sizeLength(sizeLength), dataSize(dataSize)
+{
+}
+
+EBML::Element::Element(Id id, int sizeLength, offset_t dataSize, offset_t):
+  id(id), sizeLength(sizeLength), dataSize(dataSize)
+{
+}
+
+EBML::Element::~Element() = default;
+
+bool EBML::Element::read(File& file)
+{
+  skipData(file);
+  return true;
+}
+
 void EBML::Element::skipData(File &file)
 {
   file.seek(dataSize, File::Position::Current);
 }
 
+EBML::Element::Id EBML::Element::getId() const
+{
+  return id;
+}
+
 offset_t EBML::Element::headSize() const
 {
   return idSize(id) + sizeLength;
 }
 
+offset_t EBML::Element::getSize() const
+{
+  return headSize() + dataSize;
+}
+
+int EBML::Element::getSizeLength() const
+{
+  return sizeLength;
+}
+
+int64_t EBML::Element::getDataSize() const
+{
+  return dataSize;
+}
+
 ByteVector EBML::Element::render()
 {
   ByteVector buffer = renderId();

taglib/matroska/ebml/ebmlelement.h

@@ -106,22 +106,17 @@ namespace TagLib
         MkChapLanguage            = 0x437C,
       };
 
-      Element(Id id, int sizeLength, offset_t dataSize) :
-        id(id), sizeLength(sizeLength), dataSize(dataSize) {}
-      Element(Id id, int sizeLength, offset_t dataSize, offset_t) :
-        id(id), sizeLength(sizeLength), dataSize(dataSize) {}
-      virtual ~Element() = default;
-      virtual bool read(File &file)
-      {
-        skipData(file);
-        return true;
-      }
+      Element(Id id, int sizeLength, offset_t dataSize);
+      Element(Id id, int sizeLength, offset_t dataSize, offset_t);
+      virtual ~Element();
+
+      virtual bool read(File &file);
       void skipData(File &file);
-      Id getId() const { return id; }
+      Id getId() const;
       offset_t headSize() const;
-      offset_t getSize() const { return headSize() + dataSize; }
-      int getSizeLength() const { return sizeLength; }
-      int64_t getDataSize() const { return dataSize; }
+      offset_t getSize() const;
+      int getSizeLength() const;
+      int64_t getDataSize() const;
       ByteVector renderId() const;
       virtual ByteVector render();
       static std::unique_ptr<Element> factory(File &file);

taglib/matroska/ebml/ebmlfloatelement.cpp

@@ -31,6 +31,24 @@
 
 using namespace TagLib;
 
+EBML::FloatElement::FloatElement(Id id, int sizeLength, offset_t dataSize):
+  Element(id, sizeLength, dataSize)
+{
+}
+
+EBML::FloatElement::FloatElement(Id id, int sizeLength, offset_t dataSize, offset_t):
+  Element(id, sizeLength, dataSize)
+{
+}
+
+EBML::FloatElement::FloatElement(Id id):
+  FloatElement(id, 0, 0)
+{
+}
+
+EBML::FloatElement::FloatVariantType EBML::FloatElement::getValue() const
+{ return value; }
+
 double EBML::FloatElement::getValueAsDouble(double defaultValue) const
 {
   if(std::holds_alternative<double>(value)) {
@@ -42,6 +60,11 @@ double EBML::FloatElement::getValueAsDouble(double defaultValue) const
   return defaultValue;
 }
 
+void EBML::FloatElement::setValue(FloatVariantType val)
+{
+  value = val;
+}
+
 bool EBML::FloatElement::read(File &file)
 {
   const ByteVector buffer = file.readBlock(dataSize);

taglib/matroska/ebml/ebmlfloatelement.h

@@ -39,16 +39,13 @@ namespace TagLib {
     public:
       using FloatVariantType = std::variant<std::monostate, float, double>;
 
-      FloatElement(Id id, int sizeLength, offset_t dataSize) :
-        Element(id, sizeLength, dataSize) {}
-      FloatElement(Id id, int sizeLength, offset_t dataSize, offset_t) :
-        Element(id, sizeLength, dataSize) {}
-      explicit FloatElement(Id id) :
-        FloatElement(id, 0, 0) {}
-
-      FloatVariantType getValue() const { return value; }
+      FloatElement(Id id, int sizeLength, offset_t dataSize);
+      FloatElement(Id id, int sizeLength, offset_t dataSize, offset_t);
+      explicit FloatElement(Id id);
+
+      FloatVariantType getValue() const;
       double getValueAsDouble(double defaultValue = 0.0) const;
-      void setValue(FloatVariantType val) { value = val; }
+      void setValue(FloatVariantType val);
       bool read(File &file) override;
       ByteVector render() override;
 

taglib/matroska/ebml/ebmlmasterelement.cpp

@@ -25,13 +25,78 @@
 
 using namespace TagLib;
 
+EBML::MasterElement::MasterElement(Id id, int sizeLength, offset_t dataSize, offset_t offset):
+  Element(id, sizeLength, dataSize), offset(offset)
+{
+}
+
+EBML::MasterElement::MasterElement(Id id):
+  Element(id, 0, 0), offset(0)
+{
+}
+
 EBML::MasterElement::~MasterElement() = default;
 
+offset_t EBML::MasterElement::getOffset() const
+{
+  return offset;
+}
+
 void EBML::MasterElement::appendElement(std::unique_ptr<Element> &&element)
 {
   elements.push_back(std::move(element));
 }
 
+std::list<std::unique_ptr<EBML::Element>>::iterator EBML::MasterElement::begin()
+{
+  return elements.begin();
+}
+
+std::list<std::unique_ptr<EBML::Element>>::iterator EBML::MasterElement::end()
+{
+  return elements.end();
+}
+
+std::list<std::unique_ptr<EBML::Element>>::const_iterator EBML::MasterElement::begin() const
+{
+  return elements.begin();
+}
+
+std::list<std::unique_ptr<EBML::Element>>::const_iterator EBML::MasterElement::end() const
+{
+  return elements.end();
+}
+
+std::list<std::unique_ptr<EBML::Element>>::const_iterator EBML::MasterElement::cbegin() const
+{
+  return elements.cbegin();
+}
+
+std::list<std::unique_ptr<EBML::Element>>::const_iterator EBML::MasterElement::cend() const
+{
+  return elements.cend();
+}
+
+offset_t EBML::MasterElement::getPadding() const
+{
+  return padding;
+}
+
+void EBML::MasterElement::setPadding(offset_t numBytes)
+{
+  padding = numBytes;
+}
+
+offset_t EBML::MasterElement::getMinRenderSize() const
+{
+  return minRenderSize;
+}
+
+void EBML::MasterElement::setMinRenderSize(offset_t minimumSize)
+{
+  minRenderSize = minimumSize;
+}
+
 bool EBML::MasterElement::read(File &file)
 {
   const offset_t maxOffset = file.tell() + dataSize;

taglib/matroska/ebml/ebmlmasterelement.h

@@ -22,9 +22,10 @@
 #define TAGLIB_EBMLMASTERELEMENT_H
 #ifndef DO_NOT_DOCUMENT
 
+#include <list>
+
 #include "ebmlelement.h"
 #include "taglib.h"
-#include "tlist.h"
 
 namespace TagLib
 {
@@ -34,26 +35,24 @@ namespace TagLib
     class MasterElement : public Element
     {
     public:
-      MasterElement(Id id, int sizeLength, offset_t dataSize, offset_t offset) :
-        Element(id, sizeLength, dataSize), offset(offset) {}
-      explicit MasterElement(Id id) :
-        Element(id, 0, 0), offset(0) {}
+      MasterElement(Id id, int sizeLength, offset_t dataSize, offset_t offset);
+      explicit MasterElement(Id id);
       ~MasterElement() override;
 
-      offset_t getOffset() const { return offset; }
+      offset_t getOffset() const;
       bool read(File &file) override;
       ByteVector render() override;
       void appendElement(std::unique_ptr<Element> &&element);
-      std::list<std::unique_ptr<Element>>::iterator begin() { return elements.begin(); }
-      std::list<std::unique_ptr<Element>>::iterator end() { return elements.end(); }
-      std::list<std::unique_ptr<Element>>::const_iterator begin() const { return elements.begin(); }
-      std::list<std::unique_ptr<Element>>::const_iterator end() const { return elements.end(); }
-      std::list<std::unique_ptr<Element>>::const_iterator cbegin() const { return elements.cbegin(); }
-      std::list<std::unique_ptr<Element>>::const_iterator cend() const { return elements.cend(); }
-      offset_t getPadding() const { return padding; }
-      void setPadding(offset_t numBytes) { padding = numBytes; }
-      offset_t getMinRenderSize() const { return minRenderSize; }
-      void setMinRenderSize(offset_t minimumSize) { minRenderSize = minimumSize; }
+      std::list<std::unique_ptr<Element>>::iterator begin();
+      std::list<std::unique_ptr<Element>>::iterator end();
+      std::list<std::unique_ptr<Element>>::const_iterator begin() const;
+      std::list<std::unique_ptr<Element>>::const_iterator end() const;
+      std::list<std::unique_ptr<Element>>::const_iterator cbegin() const;
+      std::list<std::unique_ptr<Element>>::const_iterator cend() const;
+      offset_t getPadding() const;
+      void setPadding(offset_t numBytes);
+      offset_t getMinRenderSize() const;
+      void setMinRenderSize(offset_t minimumSize);
 
     protected:
       offset_t offset;