Make tags and properties more flexible

Author: ufleisch

taglib/matroska/ebml/ebmlelement.h

@@ -69,6 +69,7 @@ namespace TagLib::EBML {
     inline constexpr Element::Id MkSimpleTag               = 0x67C8;
     inline constexpr Element::Id MkTagName                 = 0x45A3;
     inline constexpr Element::Id MkTagLanguage             = 0x447A;
+    inline constexpr Element::Id MkTagBinary               = 0x4485;
     inline constexpr Element::Id MkTagString               = 0x4487;
     inline constexpr Element::Id MkTagsTagLanguage         = 0x447A;
     inline constexpr Element::Id MkTagsLanguageDefault     = 0x4484;

taglib/matroska/ebml/ebmlmktags.cpp

@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "ebmlmktags.h"
+#include "ebmlbinaryelement.h"
 #include "ebmluintelement.h"
 #include "ebmlstringelement.h"
 #include "matroskatag.h"
@@ -79,7 +80,8 @@ Matroska::Tag *EBML::MkTags::parse()
           tagName = &(static_cast<UTF8StringElement *>(simpleTagChild)->getValue());
         else if(id == ElementIDs::MkTagString && !tagValueString)
           tagValueString = &(static_cast<UTF8StringElement *>(simpleTagChild)->getValue());
-        // TODO implement binary
+        else if(id == ElementIDs::MkTagBinary && !tagValueBinary)
+          tagValueBinary = &(static_cast<BinaryElement *>(simpleTagChild)->getValue());
         else if(id == ElementIDs::MkTagsTagLanguage && !language)
           language = &(static_cast<Latin1StringElement *>(simpleTagChild)->getValue());
         else if(id == ElementIDs::MkTagsLanguageDefault)
@@ -96,7 +98,7 @@ Matroska::Tag *EBML::MkTags::parse()
         sTagString->setValue(*tagValueString);
         sTag = sTagString;
       }
-      else if(tagValueBinary) {
+      else { // tagValueBinary must be non null
         auto sTagBinary = new Matroska::SimpleTagBinary();
         sTagBinary->setTargetTypeValue(targetTypeValue);
         sTagBinary->setValue(*tagValueBinary);

taglib/matroska/matroskaattachments.h

@@ -48,12 +48,15 @@ namespace TagLib {
       void removeAttachedFile(AttachedFile *file);
       void clear();
       const AttachedFileList &attachedFileList() const;
-      bool render() override;
 
     private:
       friend class EBML::MkAttachments;
       friend class File;
       class AttachmentsPrivate;
+
+      // private Element implementation
+      bool render() override;
+
       TAGLIB_MSVC_SUPPRESS_WARNING_NEEDS_TO_HAVE_DLL_INTERFACE
       std::unique_ptr<AttachmentsPrivate> d;
     };

taglib/matroska/matroskacues.cpp

@@ -154,5 +154,6 @@ bool Matroska::CueTrack::isValid(TagLib::File &file, offset_t segmentDataOffset)
 
 bool Matroska::CueTrack::adjustOffset(offset_t, offset_t)
 {
+  // TODO implement
   return false;
 }

taglib/matroska/matroskafile.cpp

@@ -28,6 +28,7 @@
 #include "ebmlmksegment.h"
 #include "tlist.h"
 #include "tdebug.h"
+#include "tagutils.h"
 
 #include <memory>
 #include <vector>
@@ -57,10 +58,10 @@ class Matroska::File::FilePrivate
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool Matroska::File::isSupported(IOStream *)
+bool Matroska::File::isSupported(IOStream *stream)
 {
-  // TODO implement
-  return false;
+  const ByteVector id = Utils::readHeader(stream, 4, false);
+  return id.startsWith("\x1A\x45\xDF\xA3");
 }
 
 ////////////////////////////////////////////////////////////////////////////////

taglib/matroska/matroskasegment.h

@@ -46,6 +46,5 @@ namespace TagLib::Matroska {
   };
 }
 
-
 #endif
 #endif